Convert #624849 to Flügger