Convert #618270 to Flügger