Convert #350484 to Flügger