Remove extra range check