improve fix for browser support