Re #940 - changed int to long to match current code