Fixed for Firefox Nightly