Fix logic of assignee