Convert #624738 to Flügger