Problem with shapeshifting

[sube]

OK my problem is the following: I modded a unit1 which can shapechange into unit2 via the #shapechange command. Unit1 has F2B3, and unit2 has no magic paths. The result is that unit2 also gets F2B3, which i do not want.

So i add to unit2:

#magicboost 0 -2
#magicboost 7 -3

This takes out F2 from unit2, however B3 is still there. Is it a bug, or am i missing something?

On a side note, unit1 shapechanges to unit2 when wounded during a battle, reverting back to unit once the battle is over. I thought that was the case for #secondshape and #firstshape only. So, is this also a bug, or is it working as intended?