Convert #338391 to Flügger