Convert #623607 to Flügger