Convert #517542 to Flügger