Another modification to the claim rights checking