fixed dispose issue