Add workaround for FF bug