Convert #624846 to Flügger