Convert #618107 to Flügger