Added badly constructed range handling