Attempt at fixing Chrome and Internet Explorer issues