Fix FF2 issue #2857

Issue #2857