Added a few extra cases of the same mis-assumption

(extending pull request #32)