More fix for Firefox