Convert #691887 to Flügger