Fixing Dispose issue on Geometry classes