fixing trade assignment issue