Fixed cross-browser support