Convert #517097 to Flügger