Convert #721981 to Flügger