Forgot range guards around range-specific code