negotiation bug fix