Works now with more browsers