Convert #624537 to Flügger