Fix infinite loop on IE.
Merge branch 'hotfix/2.0.1'