Convert #654853 to Flügger