Convert #517484 to Flügger