fix after changes to Correspondence/Map