Fixed critical this-that
Merge pull request #2 from mck1117/hotfix

Fixed critical this-that