Convert #338328 to Flügger