trying to fix the FF issues