diff --git a/build.properties b/build.properties
index 7965a72e..a3114748 100644
--- a/build.properties
+++ b/build.properties
@@ -2,7 +2,7 @@
 PROJECT: env-js
 BUILD_MAJOR: 1
 BUILD_MINOR: 2
-BUILD_ID: 25
+BUILD_ID: 26
 BUILD_VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}
 BUILD: ${PROJECT}.${BUILD_VERSION}
 VERSION: ${BUILD} ${DSTAMP}
diff --git a/src/window/window.js b/src/window/window.js
index 978af5f5..b88a8213 100644
--- a/src/window/window.js
+++ b/src/window/window.js
@@ -160,16 +160,12 @@ Window = function(scope, parent, opener){
         get location(){
             return $location;
         },
-        set location(uri){
-            uri = Envjs.uri(uri);
-            //new Window(this, this.parent, this.opener);
-            if($location.href == uri){
-                $location.reload();
-            }else if($location.href == 'about:blank'){
-                $location.assign(uri);
-            }else{
-                $location.replace(uri);
-            }
+        set location(url){
+			//very important or you will go into an infinite
+        	//loop when creating a xml document
+        	if(url) {
+            	$location.assign(Envjs.uri(url));
+			}
         },
         get name(){
             return $name;
diff --git a/src/xhr/document.js b/src/xhr/document.js
index e699faf6..7c26872c 100644
--- a/src/xhr/document.js
+++ b/src/xhr/document.js
@@ -13,13 +13,11 @@ __extend__(Document.prototype,{
         }
     },
     get location(){
-        return new Location(this.documentURI, this);
+        return this.ownerWindow.location;
     },
     set location(url){
         //very important or you will go into an infinite
         //loop when creating a xml document
-        if(url) {
-            this.location.replace(url);
-        }
+        this.ownerWindow.location = url;
     }
 });