Removing one call to hasFields