Convert #618337 to Flügger