fix for mapper & astar