fix tiny problems of negotiation