e458f8f fix:More robust range check.