PSI weapon /armour

[The Odor]

I do not know if this was solved in SMAX, or in a patch, but in vanilla SMAC, this what happened to me:
1. if i put PSI armor and some non PSI weapon, the unit also attacks with PSI weapon, instead of what it has.
2. if i put PSI weapon and some non PSI armor, the unit also defends with PSI armor, instead of what it has.

I did not played SMAX so much so I could use PSI weapon/armor, to check it out...

[Yitzi]

It works correctly for me in SMAX.

[gwillybj]

It works correctly for me in SMAX.

Same.