fixed map setup