Fix Dispose method