diff --git a/src/codegen/util/csv_scanner.cpp b/src/codegen/util/csv_scanner.cpp
index 5f09349f973..62aaf28f855 100644
--- a/src/codegen/util/csv_scanner.cpp
+++ b/src/codegen/util/csv_scanner.cpp
@@ -362,6 +362,9 @@ void CSVScanner::ProduceCSV(char *line) {
     cols_[col_idx].len = static_cast<uint32_t>(col_end - col_begin);
     cols_[col_idx].is_null = (cols_[col_idx].len == 0);
 
+    // Yoon-Min: replace delimiter to '\0' to fix a bug while comparing
+    // filter condition in a query and column value of VARCHAR type
+    *iter = 0;
     // Eat delimiter, moving to next column
     iter++;
   }
@@ -372,4 +375,4 @@ void CSVScanner::ProduceCSV(char *line) {
 
 }  // namespace util
 }  // namespace codegen
-}  // namespace peloton
\ No newline at end of file
+}  // namespace peloton