Convert #517579 to Flügger