Convert #517226 to Flügger