Convert #618682 to Flügger