Convert #375845 to Flügger