Fixed issue with long / int