Improve support in Firefox