Convert #518336 to Flügger