Convert #517561 to Flügger