diff --git a/classes/db/queryparts/Query.class.php b/classes/db/queryparts/Query.class.php
index 681c5f5d9..acb9e4e15 100644
--- a/classes/db/queryparts/Query.class.php
+++ b/classes/db/queryparts/Query.class.php
@@ -157,7 +157,7 @@ class Query extends BaseObject
 
 			foreach($this->columnList as $columnName)
 			{
-				$columnName = $dbParser->escapeColumn($columnName);
+				$columnName = $dbParser->escapeColumnExpression($columnName);
 				$selectColumns[] = new SelectExpression($columnName);
 			}
 			unset($this->columns);