Convert #517197 to Flügger