Convert #517736 to Flügger