Convert #624261 to Flügger