Fixed the Map to be x, y coordinate compatible