Convert #517553 to Flügger