diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java
index 2b40f8ed4a77e5fe823668d2d5cd066a2c367840..1747fcac7579e0955c5592d2e3e8e79b64968a55 100644
--- a/src/ac/ed/lurg/ModelConfig.java
+++ b/src/ac/ed/lurg/ModelConfig.java
@@ -139,4 +139,6 @@ public class ModelConfig {
 	
 	public static final double IRRIG_COST_SCALE_FACTOR = getDoubleProperty("IRRIG_COST_SCALE_FACTOR", 2.0);
 	public static final double TRANSPORT_LOSSES = getDoubleProperty("TRANSPORT_LOSSES", 0.2);  // in international trade
+	
+	public static final boolean DEBUG_LIMIT_COUNTRIES = getBooleanProperty("DEBUG_LIMIT_COUNTRIES", false);
 }
\ No newline at end of file
diff --git a/src/ac/ed/lurg/ModelMain.java b/src/ac/ed/lurg/ModelMain.java
index 5d1694871c967437a292393de22fe4a5d12c08be..d86ecb774c513bfd2c45d1857265671167e46dc1 100644
--- a/src/ac/ed/lurg/ModelMain.java
+++ b/src/ac/ed/lurg/ModelMain.java
@@ -301,8 +301,10 @@ public class ModelMain {
 		for (CompositeCountry cc : countryGrouping) {
 			
 			// DEBUG code
-			if (!(cc.getName().equals("United States of America") || cc.getName().equals("Russian Federationxx") || cc.getName().equals("South Asia_otherxx")) ) {
-				continue;
+			if (ModelConfig.DEBUG_LIMIT_COUNTRIES) {
+				if (!(cc.getName().equals("United States of America") || cc.getName().equals("Russian Federationxx") || cc.getName().equals("South Asia_otherxx")) ) {
+					continue;
+				}
 			}
 			
 			List<RasterKey> keys = countryBoundaryRaster.getKeysFor(cc);