Convert #624370 to Flügger