build953

* Improved code to avoid double calls to onWriteComplete