Convert #517769 to Flügger