unit move bug last fix