Minor change in the negotiate impl