Fix problem in Firefox and Safari