Fix dispose issue