diff --git a/classes/db/DBMssql.class.php b/classes/db/DBMssql.class.php
index 0bebd948c..8fef32336 100644
--- a/classes/db/DBMssql.class.php
+++ b/classes/db/DBMssql.class.php
@@ -707,8 +707,14 @@
 			{
 				$columns = array();
 				foreach($output->arg_columns as $col){
-					if(strpos($col,'[')===false && strpos($col,' ')==false) $columns[] = '['.$col.']'; 
-					else $columns[] = $col;
+					unset($tmpCol);
+					$tmpCol = explode('.', $col);
+					if(isset($tmpCol[1])) $col = $tmpCol[1];
+
+					if(strpos($col,'[')===false && strpos($col,' ')==false) $col = '['.$col.']'; 
+					if(isset($tmpCol[1])) $col = $tmpCol[0].'.'.$col;
+
+					$columns[] = $col;
 				}
 				
 				$columns = join(',',$columns);
@@ -826,8 +832,14 @@
 			{
 				$columns = array();
 				foreach($output->arg_columns as $col){
-					if(strpos($col,'[')===false && strpos($col,' ')==false) $columns[] = '['.$col.']'; 
-					else $columns[] = $col;
+					unset($tmpCol);
+					$tmpCol = explode('.', $col);
+					if(isset($tmpCol[1])) $col = $tmpCol[1];
+
+					if(strpos($col,'[')===false && strpos($col,' ')==false) $col = '['.$col.']'; 
+					if(isset($tmpCol[1])) $col = $tmpCol[0].'.'.$col;
+
+					$columns[] = $col;
 				}
 				
 				$columns = join(',',$columns);