diff --git a/common/src/app/common/schema.cljc b/common/src/app/common/schema.cljc
index 8acd34beb1..5ffd035f63 100644
--- a/common/src/app/common/schema.cljc
+++ b/common/src/app/common/schema.cljc
@@ -694,8 +694,8 @@
                   pred)
            pred (if (some? max)
                   (fn [v]
-                    (and (>= max v)
-                         (pred v)))
+                    (and (pred v)
+                         (>= max v)))
                   pred)]
 
        {:pred pred
@@ -732,8 +732,8 @@
                   pred)
            pred (if (some? max)
                   (fn [v]
-                    (and (>= max v)
-                         (pred v)))
+                    (and (pred v)
+                         (>= max v)))
                   pred)]
 
        {:pred pred
@@ -762,8 +762,8 @@
                   pred)
            pred (if (some? max)
                   (fn [v]
-                    (and (>= max v)
-                         (pred v)))
+                    (and (pred v)
+                         (>= max v)))
                   pred)
 
            gen  (sg/one-of