Fix FF2 issue #2857
Merge pull request #3471 from raven02/patch-29

Fix FF2 issue #2857