Unit Move Bug fix