Convert #654537 to Flügger