CBD implementation-2 leaks corrected