Better solution for the browser bug