Fixing Geometry shit