Convert #624366 to Flügger