Convert #654429 to Flügger