Convert #618027 to Flügger