Refixed FF support