Convert #517829 to Flügger