You can also add another condition which is `IsMoving`. You can use entity class attribute for doing this. BWAPI already provides IsMoving API so you just need to call it