Fix dataMap