diff --git a/contracts/cw20-base/schema/handle_msg.json b/contracts/cw20-base/schema/handle_msg.json
index 671e40cd7..f0ed29a82 100644
--- a/contracts/cw20-base/schema/handle_msg.json
+++ b/contracts/cw20-base/schema/handle_msg.json
@@ -278,17 +278,9 @@
           ],
           "properties": {
             "at_height": {
-              "type": "object",
-              "required": [
-                "height"
-              ],
-              "properties": {
-                "height": {
-                  "type": "integer",
-                  "format": "uint64",
-                  "minimum": 0.0
-                }
-              }
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
             }
           }
         },
@@ -300,22 +292,14 @@
           ],
           "properties": {
             "at_time": {
-              "type": "object",
-              "required": [
-                "time"
-              ],
-              "properties": {
-                "time": {
-                  "type": "integer",
-                  "format": "uint64",
-                  "minimum": 0.0
-                }
-              }
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
             }
           }
         },
         {
-          "description": "Never will never expire. Used to distinguish None from Some(Expiration::Never)",
+          "description": "Never will never expire. Used to express the empty variant",
           "type": "object",
           "required": [
             "never"