fixing parsing of CMap.