Better cross-browser support