Attempt 1 at fixing the claim permission bug.