Convert #624878 to Flügger