Convert #623605 to Flügger