Convert #517507 to Flügger