fix for ie
Merge branch 'develop'