Convert #624906 to Flügger