SOS-1697 Fixing FF12 issue