diff --git a/src/PhpWord/Element/SDT.php b/src/PhpWord/Element/SDT.php
index 6d7f103f..6d4207b7 100644
--- a/src/PhpWord/Element/SDT.php
+++ b/src/PhpWord/Element/SDT.php
@@ -143,7 +143,7 @@ class SDT extends Text
 
     /**
      * Get tag
-     * 
+     *
      * @return string
      */
     public function getTag()
diff --git a/src/PhpWord/Writer/Word2007/Element/SDT.php b/src/PhpWord/Writer/Word2007/Element/SDT.php
index c6ea9f01..908f9f49 100644
--- a/src/PhpWord/Writer/Word2007/Element/SDT.php
+++ b/src/PhpWord/Writer/Word2007/Element/SDT.php
@@ -50,10 +50,10 @@ class SDT extends Text
 
         // Properties
         $xmlWriter->startElement('w:sdtPr');
-        $xmlWriter->writeElementBlock('w:alias', 'w:val', $alias);
-        $xmlWriter->writeElementBlock('w:tag', 'w:val', $tag);
-        $xmlWriter->writeElementBlock('w:id', 'w:val', rand(100000000, 999999999));
+        $xmlWriter->writeElementIf($alias != null, 'w:alias', 'w:val', $alias);
         $xmlWriter->writeElementBlock('w:lock', 'w:val', 'sdtLocked');
+        $xmlWriter->writeElementBlock('w:id', 'w:val', rand(100000000, 999999999));
+        $xmlWriter->writeElementIf($tag != null, 'w:tag', 'w:val', $tag);
         $this->$writeFormField($xmlWriter, $element);
         $xmlWriter->endElement(); // w:sdtPr
 
diff --git a/tests/PhpWord/Element/SDTTest.php b/tests/PhpWord/Element/SDTTest.php
index fc3682b6..537841a6 100644
--- a/tests/PhpWord/Element/SDTTest.php
+++ b/tests/PhpWord/Element/SDTTest.php
@@ -32,14 +32,20 @@ class SDTTest extends \PHPUnit_Framework_TestCase
         $types = array('comboBox', 'dropDownList', 'date');
         $type = $types[rand(0, 2)];
         $value = rand(0, 100);
+        $alias = 'alias';
+        $tag = 'my_tag';
         $object = new SDT($type);
         $object->setValue($value);
         $object->setListItems($types);
+        $object->setAlias($alias);
+        $object->setTag($tag);
 
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\SDT', $object);
         $this->assertEquals($type, $object->getType());
         $this->assertEquals($types, $object->getListItems());
         $this->assertEquals($value, $object->getValue());
+        $this->assertEquals($alias, $object->getAlias());
+        $this->assertEquals($tag, $object->getTag());
     }
 
     /**
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 6186695b..0ebc7c57 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -269,13 +269,17 @@ class ElementTest extends \PHPUnit_Framework_TestCase
 
         $section->addSDT('comboBox');
         $section->addSDT('dropDownList');
-        $section->addSDT('date');
+        $section->addSDT('date')->setAlias('date_alias')->setTag('my_tag');
 
         $doc = TestHelperDOCX::getDocument($phpWord);
 
-        $path = '/w:document/w:body/w:p/w:sdt/w:sdtPr';
-        $this->assertTrue($doc->elementExists($path . '/w:comboBox'));
-        $this->assertTrue($doc->elementExists($path . '/w:dropDownList'));
-        $this->assertTrue($doc->elementExists($path . '/w:date'));
+        $path = '/w:document/w:body/w:p';
+
+        $this->assertTrue($doc->elementExists($path . '[1]/w:sdt/w:sdtPr/w:comboBox'));
+        $this->assertTrue($doc->elementExists($path . '[2]/w:sdt/w:sdtPr/w:dropDownList'));
+        $this->assertFalse($doc->elementExists($path . '[2]/w:sdt/w:sdtPr/w:alias'));
+        $this->assertTrue($doc->elementExists($path . '[3]/w:sdt/w:sdtPr/w:date'));
+        $this->assertTrue($doc->elementExists($path . '[3]/w:sdt/w:sdtPr/w:alias'));
+        $this->assertTrue($doc->elementExists($path . '[3]/w:sdt/w:sdtPr/w:tag'));
     }
 }
diff --git a/tests/PhpWord/_includes/XmlDocument.php b/tests/PhpWord/_includes/XmlDocument.php
index ef56ed15..eb335278 100644
--- a/tests/PhpWord/_includes/XmlDocument.php
+++ b/tests/PhpWord/_includes/XmlDocument.php
@@ -162,4 +162,22 @@ class XmlDocument
 
         return !($nodeList->length == 0);
     }
+
+    /**
+     * Returns the xml, or part of it as a formatted string
+     *
+     * @param string $path
+     * @param string $file
+     * @return string
+     */
+    public function printXml($path = '/w:document', $file = 'word/document.xml')
+    {
+        $newdoc = new \DOMDocument();
+        $newdoc->formatOutput = true;
+        $newdoc->preserveWhiteSpace = false;
+        $node = $newdoc->importNode($this->getElement($path, $file), true);
+        $newdoc->appendChild($node);
+
+        return $newdoc->saveXML($node);
+    }
 }