Convert #624289 to Flügger