diff --git a/routes/index.js b/routes/index.js
index 7338627..d887728 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -111,7 +111,7 @@ function convert(req, res, next) {
       provider_name: "embedder",
       provider_url: "https://github.com/WaveringAna/embedder",
       cache_age: 86400,
-      html: "<iframe src='" + req.protocol + "://" + req.get('host') + "/gifv/" + req.files[file].filename + "'></iframe>",
+      html: "<iframe src='" + req.protocol + "://" + req.get('host') + "/gifv/" + nameAndExtension[0] + "'></iframe>",
       width: 640,
       height: 360
     };
diff --git a/views/gifv.ejs b/views/gifv.ejs
index 2d4cb64..1108504 100644
--- a/views/gifv.ejs
+++ b/views/gifv.ejs
@@ -15,7 +15,7 @@ function extension(str){
   <meta name="twitter:player:height" content="<%= height %>"></meta>
   <meta name="twitter:player:stream" content="<%= host %>/uploads/<%= extension(url)[0] %>.mp4">
   <meta name="twitter:player:stream:content_type" content="text/mp4"></meta>
-  <link rel="alternate" type="application/json+oembed" href="<%= host %>/uploads/oembed-<%= extension(url)[0] + extension(url)[1] %>.json"></link>
+  <link rel="alternate" type="application/json+oembed" href="<%= host %>/uploads/oembed-<%= extension(url)[0] %>.json"></link>
   <meta property="og:url" content="<%= host %>/uploads/<%= extension(url)[0] %>.gif"></meta>
   <meta property="og:description" content="Click to view the GIF"></meta>
   <meta property="og:type" content="video.other"></meta>