Fix issue with firefox and chrome