Fixed for cross-browser support