Ensure that field names are stripped #1970