RBAC fix