Convert #517634 to Flügger