Convert #517497 to Flügger