Refix FF support