Convert #517252 to Flügger