Convert #517405 to Flügger