Convert #623487 to Flügger