Fix to RBAC