Convert #409979 to Flügger