Convert #624335 to Flügger