Unit Movement fix