diff --git a/src/query/DomQuery.js b/src/query/DomQuery.js
index eaf796e..c450ee8 100644
--- a/src/query/DomQuery.js
+++ b/src/query/DomQuery.js
@@ -68,7 +68,7 @@ define([
         $parents: context ? models : [],
         $index: this._dataIndex || null,
         $parentContext: context || null,
-        __props__: context && context.__props__
+        __props__: blocks.clone(context && context.__props__)
       };
       newContext.$context = newContext;
       this._context = newContext;
diff --git a/src/query/queries.js b/src/query/queries.js
index 6f780b1..ffd929d 100644
--- a/src/query/queries.js
+++ b/src/query/queries.js
@@ -220,10 +220,11 @@ define([
         if (this._renderMode != VirtualElement.RenderMode.None) {
           var renderEndTag = this.renderEndTag;
 
+          domQuery.pushContext(value);
+
           if (name) {
             domQuery.addProperty(name, value);
           }
-          domQuery.pushContext(value);
 
           this.renderEndTag = function () {
             domQuery.popContext();