correct rename of function contains_fields