Convert #624339 to Flügger