Convert #517363 to Flügger