fixup assignee disambiguation