first attempt to correct the optgeom with the new internal convention