Fix entitlement behavior