Convert #517951 to Flügger