FF 3.6 fix