SONAR-5168 Fix FF bug