Convert #338361 to Flügger