Added fix for Firefox Nightly problems