diff --git a/src/cemerick/url.cljx b/src/cemerick/url.cljx
index 75ff53d..9ffb88c 100644
--- a/src/cemerick/url.cljx
+++ b/src/cemerick/url.cljx
@@ -29,11 +29,11 @@
 (defn map->query
   [m]
   (some->> (seq m)
-    sort                     ; sorting makes testing a lot easier :-)
     (map (fn [[k v]]
            [(url-encode (name k))
             "="
             (url-encode (str v))]))
+    sort                     ; sorting makes testing a lot easier :-)
     (interpose "&")
     flatten
     (apply str)))
diff --git a/test/cemerick/test_url.cljx b/test/cemerick/test_url.cljx
index fe2e6d1..1cde4a1 100644
--- a/test/cemerick/test_url.cljx
+++ b/test/cemerick/test_url.cljx
@@ -11,6 +11,7 @@
 (deftest test-map-to-query-str
   (are [x y] (= x (map->query y))
        "a=1&b=2&c=3" {:a 1 :b 2 :c 3}
+       "a=1&b=2&c=3" {:a 1 "b" 2 :c 3}
        "a=1&b=2&c=3" {:a "1"  :b "2" :c "3"}
        "a=1&b=2" {"a" "1" "b" "2"}
        "a=" {"a" ""}))