incoming & map fix