diff --git a/src/metabase/api/table.clj b/src/metabase/api/table.clj
index 9f577a64df43e9cc7c21c1cef69e7f151617e9c0..c1e69d422d64d8faf1548519642b4864af6dd335 100644
--- a/src/metabase/api/table.clj
+++ b/src/metabase/api/table.clj
@@ -78,7 +78,7 @@
       updated-table)))
 
 (def ^:private dimension-options
-  (zipmap (map str (range))
+  (zipmap (range)
           (concat
            (map (fn [[name param]]
                   {:name name
@@ -109,19 +109,22 @@
                  ["Quantized by the 100 equally sized bins" ["num-bins" 100]]]))))
 
 (def ^:private dimension-options-for-response
-  (m/map-vals #(dissoc % :type) dimension-options))
+  (m/map-kv (fn [k v]
+              [(str k) (dissoc v :type)]) dimension-options))
 
 (def ^:private datetime-dimension-indexes
   (->> dimension-options
        (m/filter-kv (fn [k v] (isa? (:type v) :type/DateTime)))
        keys
-       sort))
+       sort
+       (map str)))
 
 (def ^:private numeric-dimension-indexes
   (->> dimension-options
        (m/filter-kv (fn [k v] (isa? (:type v) :type/Numeric)))
        keys
-       sort))
+       sort
+       (map str)))
 
 (defn- assoc-dimension-options [resp]
   (-> resp
diff --git a/test/metabase/api/table_test.clj b/test/metabase/api/table_test.clj
index d1f1f67faa6620a3493146980a8128ef9113a1a9..5f7c7998376524f47cd2d00a1fd779af5e464d8e 100644
--- a/test/metabase/api/table_test.clj
+++ b/test/metabase/api/table_test.clj
@@ -284,7 +284,7 @@
                             "Spiros Teofil"
                             "Szymon Theutrich"]}
             :created_at   $}))
-  ((user->client :rasta) :get 200 (format "table/%d/query_metadata?include_sensitive_fields=true" (id :users))))
+  #spy/d ((user->client :rasta) :get 200 (format "table/%d/query_metadata?include_sensitive_fields=true" (id :users))))
 
 ;;; GET api/table/:id/query_metadata
 ;;; Make sure that getting the User table does *not* include password info
@@ -484,3 +484,11 @@
                                                               :raw_table_id $
                                                               :created_at   $}))}))}])
   ((user->client :rasta) :get 200 (format "table/%d/fks" (id :users))))
+
+(expect
+  (map str (sort (map #(Long/parseLong %) (var-get datetime-dimension-indexes))))
+  (var-get datetime-dimension-indexes))
+
+(expect
+  (map str (sort (map #(Long/parseLong %) (var-get numeric-dimension-indexes))))
+  (var-get numeric-dimension-indexes))