restored FF support