Convert #517977 to Flügger