diff --git a/environment.yml b/environment.yml
index 95227a4..1c304e3 100644
--- a/environment.yml
+++ b/environment.yml
@@ -8,7 +8,7 @@ dependencies:
 - behresp>=0.9.0
 - pandas>=0.23
 - numpy>=1.13
-- paramtools>=0.10.1
+- paramtools>=0.11.0
 - pytest
 - bokeh<2.0.0
 - coverage
diff --git a/taxcrunch/defaults.json b/taxcrunch/defaults.json
index 5e310b5..22cb205 100644
--- a/taxcrunch/defaults.json
+++ b/taxcrunch/defaults.json
@@ -96,9 +96,21 @@
             }
         ],
         "validators": {
-            "range": {
-                "min": 0,
-                "max": 114
+            "when": {
+                "param": "mstat",
+                "is": "Joint",
+                "then": {
+                    "range": {
+                        "min": 0,
+                        "max": 114
+                    }
+                },
+                "otherwise": {
+                    "range": {
+                        "min": 0,
+                        "max": 0
+                    }
+                }
             }
         }
     },
@@ -206,9 +218,21 @@
             }
         ],
         "validators": {
-            "range": {
-                "min": 0,
-                "max": 9e+99
+            "when": {
+                "param": "mstat",
+                "is": "Joint",
+                "then": {
+                    "range": {
+                        "min": 0,
+                        "max": 9e+99
+                    }
+                },
+                "otherwise": {
+                    "range": {
+                        "min": 0,
+                        "max": 0
+                    }
+                }
             }
         }
     },
diff --git a/taxcrunch/defaults_batch.json b/taxcrunch/defaults_batch.json
index 9620666..5dc92ea 100644
--- a/taxcrunch/defaults_batch.json
+++ b/taxcrunch/defaults_batch.json
@@ -75,9 +75,21 @@
         "number_dims": 1,
         "value": [0],
         "validators": {
-            "range": {
-                "min": 0,
-                "max": 114
+            "when": {
+                "param": "mstat",
+                "is": 2,
+                "then": {
+                    "range": {
+                        "min": 0,
+                        "max": 114
+                    }
+                },
+                "otherwise": {
+                    "range": {
+                        "min": 0,
+                        "max": 0
+                    }
+                }
             }
         }
     },
@@ -165,9 +177,21 @@
         "number_dims": 1,
         "value": [0],
         "validators": {
-            "range": {
-                "min": 0,
-                "max": 9e+99
+            "when": {
+                "param": "mstat",
+                "is": 2,
+                "then": {
+                    "range": {
+                        "min": 0,
+                        "max": 9e+99
+                    }
+                },
+                "otherwise": {
+                    "range": {
+                        "min": 0,
+                        "max": 0
+                    }
+                }
             }
         }
     },