Convert #623925 to Flügger