diff --git a/GameEngine/Technology.php b/GameEngine/Technology.php
index 608ff06b..71ca5559 100644
--- a/GameEngine/Technology.php
+++ b/GameEngine/Technology.php
@@ -455,7 +455,7 @@ private function trainUnit($unit,$amt,$great=false) {
 					$amt = 0;
 				}
 			}else{
-			$max = $bid36[$building->getTypeLevel(36)]['attri'] - $village->unitarray['u99'];
+			$max = $bid36[$village->resarray['f'.$id]]['attri'] - ($village->unitarray['u99'] + $train_amt);
 				if($max <= $amt) {
 					$amt = 0;
 				}
diff --git a/Templates/Build/36.tpl b/Templates/Build/36.tpl
index 09888bad..683f1b3d 100644
--- a/Templates/Build/36.tpl
+++ b/Templates/Build/36.tpl
@@ -73,7 +73,11 @@
 			</div>
 			</td>
 			<?php
-			$max = $bid36[$village->resarray['f'.$id]]['attri'] - $village->unitarray['u99'];
+			$trainlist = $technology->getTrainingList(8);
+			foreach($trainlist as $train) {
+			$train_amt += $train['amt'];
+			}
+			$max = $bid36[$village->resarray['f'.$id]]['attri'] - ($village->unitarray['u99'] + $train_amt);
 			if($max < 0){
 			$max = 0;
 			}
@@ -88,7 +92,6 @@
 	} else {
 		echo "<b>Training can commence when trapper are completed.</b><br>\n";
 	}
-    $trainlist = $technology->getTrainingList(8);
     if(count($trainlist) > 0) {
     	echo "
     <table cellpadding=\"1\" cellspacing=\"1\" class=\"under_progress\">