Fix SPIQ infecting other units