Convert #517975 to Flügger