Fixed the map comparator issue...