diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php
index 3cf8be1f..41a48a37 100644
--- a/hwe/sammo/GeneralAI.php
+++ b/hwe/sammo/GeneralAI.php
@@ -2674,13 +2674,13 @@ class GeneralAI
 
         $db = DB::db();
 
-        if ($general->getVar('train') < $this->nationPolicy->properWarTrainAtmos) {
+        if ($general->getVar('train') < min(100, $this->nationPolicy->properWarTrainAtmos)) {
             return null;
         }
-        if ($general->getVar('atmos') < $this->nationPolicy->properWarTrainAtmos) {
+        if ($general->getVar('atmos') < min(100, $this->nationPolicy->properWarTrainAtmos)) {
             return null;
         }
-        if ($general->getVar('crew') < $this->nationPolicy->minWarCrew) {
+        if ($general->getVar('crew') < min(($this->fullLeadership - 2) * 100, $this->nationPolicy->minWarCrew)) {
             return null;
         }