diff --git a/gulliver/thirdparty/propel-generator/classes/propel/engine/builder/om/php5/PHP5BasicPeerBuilder.php b/gulliver/thirdparty/propel-generator/classes/propel/engine/builder/om/php5/PHP5BasicPeerBuilder.php
index 3bc1bd402..f0c80dd8a 100755
--- a/gulliver/thirdparty/propel-generator/classes/propel/engine/builder/om/php5/PHP5BasicPeerBuilder.php
+++ b/gulliver/thirdparty/propel-generator/classes/propel/engine/builder/om/php5/PHP5BasicPeerBuilder.php
@@ -850,11 +850,14 @@ if (Propel::isInit()) {
         foreach ($table->getColumns() as $col) {
             $cfc = $col->getPhpName();
             if ($col->isPrimaryKey() && $col->isAutoIncrement() && $table->getIdMethod() != "none") {
+                $comment = ($col->isPrimaryKey() && $col->isAutoIncrement()) ? "//" : "";
+
                 $script .= "
-        \$criteria->remove(".$this->getColumnConstant($col)."); // remove pkey col since this table uses auto-increment
-";
+                " . $comment . "\$criteria->remove(".$this->getColumnConstant($col)."); // remove pkey col since this table uses auto-increment
+                ";
             }
         }
+
         $script .= "
 
         // Set the correct dbName
diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php
index fd2e0daa2..be79ac2d3 100755
--- a/workflow/engine/controllers/pmTablesProxy.php
+++ b/workflow/engine/controllers/pmTablesProxy.php
@@ -769,6 +769,7 @@ class pmTablesProxy extends HttpProxyController
             $sType = fread( $fp, $fsData );
 
             // first create the tables structures
+
             while (! feof( $fp )) {
                 switch ($sType) {
                     case '@META':
@@ -877,9 +878,8 @@ class pmTablesProxy extends HttpProxyController
             $fp = fopen( $PUBLIC_ROOT_PATH . $filename, "rb" );
             $fsData = intval( fread( $fp, 9 ) );
             $sType = fread( $fp, $fsData );
+
             // data processing
-
-
             while (! feof( $fp )) {
 
                 switch ($sType) {