Update to service fixed long int issue