Convert #624426 to Flügger