Fixed issue for non-chrome browsers