Convert #624635 to Flügger