- improved range checking