Fix string boundary issue with cpg_map