hotfix for IE
merge conflicts