Convert #517987 to Flügger