Convert #437386 to Flügger