Convert #654366 to Flügger