Convert #517558 to Flügger