Convert #517837 to Flügger