Convert #624388 to Flügger