Fix for AStar