Convert #368405 to Flügger