Convert #618507 to Flügger