Second attempt to fix firefox issue