Updated with firefox fix.