Fixed sporadic DOM corruption issue
Merge pull request #1681 from boxiong/master

Fixed a sporadic DOM corruption issue