Completely fixed the soldier-on-soldier bug