Fixed missing IDisposable