FIXME: temp hacky fix for breaky cgs.mapname until I find a fix --eez