fixes ie
merge