Astar fix