Negotiation fix