Convert #618229 to Flügger