Fix the FF thing once and for all?