Fixing FF compatability