Fix for role assignment