Convert #624249 to Flügger