Convert #618127 to Flügger