fixed map problems