Convert #624934 to Flügger