Convert #624527 to Flügger