update to support FF for fix headers sample