diff --git a/4chan_x.user.js b/4chan_x.user.js
index c93e5aafc..cac22769a 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1487,7 +1487,7 @@
       return Get.insert(post, root, context);
     },
     archivedPost: function(req, board, postID, root, context) {
-      var bq, comment, data, o, post, thread, threadID;
+      var bq, comment, data, o, post, thread, threadID, _ref;
       if (post = g.posts["" + board + "." + postID]) {
         Get.insert(post, root, context);
         return;
@@ -1554,19 +1554,19 @@
         dateUTC: data.timestamp,
         comment: comment
       };
-      if (data.media_filename) {
+      if ((_ref = data.media) != null ? _ref.media_filename : void 0) {
         o.file = {
-          name: data.media_filename_processed,
-          timestamp: data.media_orig,
-          url: data.media_link || data.remote_media_link,
-          height: data.media_h,
-          width: data.media_w,
-          MD5: data.media_hash,
-          size: data.media_size,
-          turl: data.thumb_link || ("//thumbs.4chan.org/" + board + "/thumb/" + data.preview_orig),
-          theight: data.preview_h,
-          twidth: data.preview_w,
-          isSpoiler: data.spoiler === '1'
+          name: data.media.media_filename_processed,
+          timestamp: data.media.media_orig,
+          url: data.media.media_link || data.media.remote_media_link,
+          height: data.media.media_h,
+          width: data.media.media_w,
+          MD5: data.media.media_hash,
+          size: data.media.media_size,
+          turl: data.media.thumb_link || ("//thumbs.4chan.org/" + board + "/thumb/" + data.media.preview_orig),
+          theight: data.media.preview_h,
+          twidth: data.media.preview_w,
+          isSpoiler: data.media.spoiler === '1'
         };
       }
       board = g.boards[board] || new Board(board);
diff --git a/script.coffee b/script.coffee
index df476052c..02060e216 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1484,19 +1484,19 @@ Get =
       dateUTC:  data.timestamp
       comment:  comment
       # file
-    if data.media_filename
+    if data.media?.media_filename
       o.file =
-        name:      data.media_filename_processed
-        timestamp: data.media_orig
-        url:       data.media_link or data.remote_media_link
-        height:    data.media_h
-        width:     data.media_w
-        MD5:       data.media_hash
-        size:      data.media_size
-        turl:      data.thumb_link or "//thumbs.4chan.org/#{board}/thumb/#{data.preview_orig}"
-        theight:   data.preview_h
-        twidth:    data.preview_w
-        isSpoiler: data.spoiler is '1'
+        name:      data.media.media_filename_processed
+        timestamp: data.media.media_orig
+        url:       data.media.media_link or data.media.remote_media_link
+        height:    data.media.media_h
+        width:     data.media.media_w
+        MD5:       data.media.media_hash
+        size:      data.media.media_size
+        turl:      data.media.thumb_link or "//thumbs.4chan.org/#{board}/thumb/#{data.media.preview_orig}"
+        theight:   data.media.preview_h
+        twidth:    data.media.preview_w
+        isSpoiler: data.media.spoiler is '1'
 
     board = g.boards[board] or
       new Board board