Updated with IE8 fix