Convert #624742 to Flügger