Convert #623604 to Flügger