CPP-184 timeout/read/write fix