Convert #618267 to Flügger