Convert #624402 to Flügger