Fix FF support