Convert #623597 to Flügger