diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 62e88c1..d9e3c8f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
       BUILD_CONFIGURATION: Non-Steam Release
 
     name: Windows build
-    runs-on: windows-2016
+    runs-on: windows-2019
 
     steps:
     - uses: actions/checkout@v2
diff --git a/source/game/design/subsystem.cpp b/source/game/design/subsystem.cpp
index fa03a91..6698503 100644
--- a/source/game/design/subsystem.cpp
+++ b/source/game/design/subsystem.cpp
@@ -390,7 +390,6 @@ struct TemplateBlock {
 };
 
 bool conditionMatches(const SubsystemDef* cur, std::vector<std::pair<int,std::string>>& conditions) {
-	bool passesAll = true;
 	foreach(c, conditions) {
 		int type = c->first;
 		bool negation = false;
@@ -458,14 +457,14 @@ bool conditionMatches(const SubsystemDef* cur, std::vector<std::pair<int,std::st
 
 		if(!negation) {
 			if(!pass)
-				passesAll = false;
+				return false;
 		}
 		else {
 			if(pass)
-				passesAll = false;
+				return false;
 		}
 	}
-	return passesAll;
+	return true;
 }
 
 void parseConditions(const std::string& value, std::vector<std::pair<int,std::string>>& conditions) {