Convert #624469 to Flügger