Fix disposed bug