Fixed the Geometry type issue