fixed broken map scope