Fix FF2 issue #2857