Added range fail-safe