hopefully fixed map problem