Fixed deflfields so that new definitions take precedence over old ones