Fix with A*