fixed map overlapping