diff --git a/GameEngine/Building.php b/GameEngine/Building.php
index f13e6c50..ee6dfe3f 100644
--- a/GameEngine/Building.php
+++ b/GameEngine/Building.php
@@ -515,13 +515,28 @@ class Building {
 			}else{
 			$needed_plan = 0;
 			}
-			$wwvillages = $database->getVillagesID($session->uid);
-			foreach($wwvillages as $wwvillage){
-			$plan = count($database->getOwnArtefactInfoByType2($wwvillage,11));
+			$wwbuildingplan = 0;
+			$villages = $database->getVillagesID($session->uid);
+			foreach($villages as $village1){
+			$plan = count($database->getOwnArtefactInfoByType2($village1,11));
+			if($plan > 0){
+			$wwbuildingplan = 1;
+			}
+			}
+			if($session->alliance != 0){
+			$alli_users = $database->getUserByAlliance($session->alliance);
+			foreach($alli_users as $users){
+			$villages = $database->getVillagesID($users['id']);
+			if($users['id'] != $session->uid){
+			foreach($villages as $village1){
+			$plan = count($database->getOwnArtefactInfoByType2($village1,11));
 			if($plan > 0){
 			$wwbuildingplan += 1;
 			}
 			}
+			}
+			}
+			}
 			if($village->natar == 1 && $wwbuildingplan > $needed_plan) { return true; } else { return false; }
 			break;
 			case 41:
diff --git a/Templates/Build/wwupgrade.tpl b/Templates/Build/wwupgrade.tpl
index ac88fbf7..a1989801 100644
--- a/Templates/Build/wwupgrade.tpl
+++ b/Templates/Build/wwupgrade.tpl
@@ -7,27 +7,29 @@ $needed_plan = 1;
 }else{
 $needed_plan = 0;
 }
-if($session->alliance != 0){
-$alli_users = $database->getUserByAlliance($session->alliance);
+
 $wwbuildingplan = 0;
-foreach($alli_users as $users){
-$villages = $database->getVillagesID($users['id']);
-foreach($villages as $village1){
-$plan = count($database->getOwnArtefactInfoByType2($village1,11));
-if($plan > 0){
-$wwbuildingplan += 1;
-}
-}
-}
-}else{
 $villages = $database->getVillagesID($session->uid);
 foreach($villages as $village1){
 $plan = count($database->getOwnArtefactInfoByType2($village1,11));
 if($plan > 0){
+$wwbuildingplan = 1;
+}
+}
+if($session->alliance != 0){
+$alli_users = $database->getUserByAlliance($session->alliance);
+foreach($alli_users as $users){
+$villages = $database->getVillagesID($users['id']);
+if($users['id'] != $session->uid){
+foreach($villages as $village1){
+$plan = count($database->getOwnArtefactInfoByType2($village1,11));
+if($plan > 0){
 $wwbuildingplan += 1;
 }
 }
 }
+}
+}
 
 if($wwbuildingplan > $needed_plan){
 if($bindicate == 1) {