Removed earlier fix because it seems to break on a bunch on browsers