Fix disposed client bug