CLC-3636-fix For IE and Firefox
Merge pull request #2446 from NolanChan/CLC-3636-fix

CLC-3636-fix For IE and Firefox