Convert #624382 to Flügger