Convert #624358 to Flügger