trying to fix some MAC related problems