Convert #517334 to Flügger