Client memory leak fixed