Fix dispose issue

WIP