Convert #372045 to Flügger