Fixing a stupid but introduced when moving away from context nomenclature