Convert #623507 to Flügger