[BS-6] Fixing up the negotiation transfer