TS-2351 Make the Range calculations more resilient