diff --git a/src/heyarne/all_my_friends/server.clj b/src/heyarne/all_my_friends/server.clj
index e9991de..f4a2e4a 100644
--- a/src/heyarne/all_my_friends/server.clj
+++ b/src/heyarne/all_my_friends/server.clj
@@ -5,16 +5,17 @@
             [ring.middleware.defaults :refer [wrap-defaults site-defaults]]
             [ring.middleware.logger :as logger]
             [heyarne.all-my-friends.env :refer [env]])
+  (:import [java.text SimpleDateFormat])
   (:gen-class))
 
-(def rfc3339 (java.text.SimpleDateFormat. "yyyy-MM-dd'T'HH:mm:ssXXX"))
+(def rfc3339 (SimpleDateFormat. "yyyy-MM-dd'T'HH:mm:ssXXX"))
 
 (defn upload! [file predictions]
   (let [now (.format rfc3339 (java.util.Date.))
         uuid (java.util.UUID/randomUUID)
-        ext (re-find #"\.[\w]+$" (-> file :filename))
+        img-ext (re-find #"[\w]+$" (-> file :content-type))
         filename (str "uploads/" now "--" uuid)]
-    (io/copy (-> file :tempfile) (io/file (str filename ext)))
+    (io/copy (-> file :tempfile) (io/file (str filename "." img-ext)))
     (spit (str filename ".json") predictions)))
 
 (def app
@@ -26,7 +27,7 @@
                (let [{:keys [snapshot predictions]} (-> req :params)]
                  (upload! snapshot predictions)
                  {:status 201
-                  :body (str "Thanks :)")}))}]
+                  :body "Thanks :)"}))}]
      ["/*" (ring/create-resource-handler)]]
     {:conflicts (constantly nil)})))