Convert #437481 to Flügger