Convert #517535 to Flügger