#9 Try to fix A*