Convert #654887 to Flügger