Convert #618686 to Flügger