[12380] Improve [12371]. Thanks to rsa for pointing
[12381] Fix behavior of spell 42631

Thanks zkillertheman for pointing

Also fix https://github.com/scriptdev2/scriptdev2/issues/33