Convert #623697 to Flügger