Fix to allow whitespaces in field names.