Convert #624034 to Flügger