fixed get_geometry