Convert #375525 to Flügger