Convert #517779 to Flügger