COAP-13. Fix.