Fix to global fields