Fixing the data map, again!!