fix maps again