Revert "Strange cases"
Merge pull request #3 from phocks/revert-2-strange-cases

Revert "Strange cases"