Convert #624079 to Flügger