trying to fix the map...