fixed map issues