Fixing problems with caps negotiation