Convert #624291 to Flügger