diff --git a/core/src/main/groovy/com/predic8/wstool/creator/RequestTemplateCreator.groovy b/core/src/main/groovy/com/predic8/wstool/creator/RequestTemplateCreator.groovy
index 4a2ac6b2..ac201bf9 100755
--- a/core/src/main/groovy/com/predic8/wstool/creator/RequestTemplateCreator.groovy
+++ b/core/src/main/groovy/com/predic8/wstool/creator/RequestTemplateCreator.groovy
@@ -242,7 +242,10 @@ class RequestTemplateCreator extends AbstractSchemaCreator <RequestTemplateCreat
 		/*Only if the element is from the same namespace as the 
 		* top-level-element of the request, it doesn't need a prefix.
 		*/
-		if(!element.toplevel && element.schema.elementFormDefault=="unqualified" && ctx.elements[0].namespaceUri == element.namespaceUri)
+		if(!element.toplevel 
+                && element.schema.elementFormDefault == "unqualified"
+                && ctx.elements[0].namespaceUri == element.namespaceUri
+                && getNSPrefix(element, ctx) == '')
 			return element.name
 		else
 			return "${getNSPrefix(element, ctx)}:${element.name}"
diff --git a/core/src/test/groovy/com/predic8/schema/UnqualifiedTest.groovy b/core/src/test/groovy/com/predic8/schema/UnqualifiedTest.groovy
index be1e20a3..4d6f35a1 100644
--- a/core/src/test/groovy/com/predic8/schema/UnqualifiedTest.groovy
+++ b/core/src/test/groovy/com/predic8/schema/UnqualifiedTest.groovy
@@ -79,11 +79,11 @@ class UnqualifiedTest extends GroovyTestCase{
     schema.getElement('address').create(creator, new RequestTemplateCreatorContext())
     def request = strWriter.toString()
     assert request =~ /<.*?:address/   
-    assert request =~ /<name/
-    assert request =~ /<location/
-    assert request =~ /<city/
-    assert request =~ /<phone/    
-    assert request =~ /<numbers/    
+    assert request =~ /<.*?:name/
+    assert request =~ /<.*?:location/
+    assert request =~ /<.*?:city/
+    assert request =~ /<.*?:phone/    
+    assert request =~ /<.*?:numbers/    
   }
   
 }
diff --git a/core/src/test/groovy/com/predic8/wstool/creator/NamespacesInRequestTemplateCreatorTest.groovy b/core/src/test/groovy/com/predic8/wstool/creator/NamespacesInRequestTemplateCreatorTest.groovy
index 319027fd..a5f04112 100644
--- a/core/src/test/groovy/com/predic8/wstool/creator/NamespacesInRequestTemplateCreatorTest.groovy
+++ b/core/src/test/groovy/com/predic8/wstool/creator/NamespacesInRequestTemplateCreatorTest.groovy
@@ -64,7 +64,7 @@ class NamespacesInRequestTemplateCreatorTest extends GroovyTestCase{
     wsdl.getInputElementForOperation('ArticleServicePT', 'create').create(creator, new RequestTemplateCreatorContext())
     def request = strWriter.toString()
     assert request =~ /<ns1:create/   
-    assert request =~ /<article/
+    assert request =~ /<ns1:article/
     assert request =~ /<ns2:name/
     assert request =~ /<ns2:description/
     assert request =~ /<ns2:price/