Convert #618457 to Flügger