Convert #618461 to Flügger