Convert #517886 to Flügger