diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index 5f1319012c..aafe63cd44 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -274,9 +274,7 @@ public function cloneRow($search, $numberOfClones)
         }
 
         $result = $this->getSlice(0, $rowStart);
-        for ($i = 1; $i <= $numberOfClones; $i++) {
-            $result .= preg_replace('/\$\{(.*?)\}/', '\${\\1#' . $i . '}', $xmlRow);
-        }
+        $result .= implode($this->indexClonedVariables($numberOfClones, $xmlRow));
         $result .= $this->getSlice($rowEnd);
 
         $this->tempDocumentMainPart = $result;
@@ -302,10 +300,7 @@ public function cloneBlock($blockname, $clones = 1, $replace = true)
 
         if (isset($matches[3])) {
             $xmlBlock = $matches[3];
-            $cloned = array();
-            for ($i = 1; $i <= $clones; $i++) {
-                $cloned[] = $xmlBlock;
-            }
+            $cloned = $this->indexClonedVariables($clones, $xmlBlock);
 
             if ($replace) {
                 $this->tempDocumentMainPart = str_replace(
@@ -545,4 +540,22 @@ protected function getSlice($startPosition, $endPosition = 0)
 
         return substr($this->tempDocumentMainPart, $startPosition, ($endPosition - $startPosition));
     }
+
+    /**
+     * Replaces variable names in cloned 
+     * rows/blocks with indexed names
+     *
+     * @param integer $count
+     * @param string $xmlBlock
+     *
+     * @return string
+     */
+    protected function indexClonedVariables($count, $xmlBlock)
+    {
+        $results = array();
+        for ($i = 1; $i <= $count; $i++) {
+            $results[] = preg_replace('/\$\{(.*?)\}/', '\${\\1#' . $i . '}', $xmlBlock);
+        }
+        return $results;
+    }
 }
diff --git a/tests/PhpWord/TemplateProcessorTest.php b/tests/PhpWord/TemplateProcessorTest.php
index c5a4b1a32f..bd9455f689 100644
--- a/tests/PhpWord/TemplateProcessorTest.php
+++ b/tests/PhpWord/TemplateProcessorTest.php
@@ -199,13 +199,14 @@ public function testCloneDeleteBlock()
         $templateProcessor = new TemplateProcessor(__DIR__ . '/_files/templates/clone-delete-block.docx');
 
         $this->assertEquals(
-            array('DELETEME', '/DELETEME', 'CLONEME', '/CLONEME'),
+            array('DELETEME', '/DELETEME', 'CLONEME', 'blockVariable', '/CLONEME'),
             $templateProcessor->getVariables()
         );
 
         $docName = 'clone-delete-block-result.docx';
         $templateProcessor->cloneBlock('CLONEME', 3);
         $templateProcessor->deleteBlock('DELETEME');
+        $templateProcessor->setValue('blockVariable#3', 'Test');
         $templateProcessor->saveAs($docName);
         $docFound = file_exists($docName);
         unlink($docName);
diff --git a/tests/PhpWord/_files/templates/clone-delete-block.docx b/tests/PhpWord/_files/templates/clone-delete-block.docx
index 049d5ca415..986742e369 100644
Binary files a/tests/PhpWord/_files/templates/clone-delete-block.docx and b/tests/PhpWord/_files/templates/clone-delete-block.docx differ