[Fixes] - Firefox fix