diff --git a/4chan_x.user.js b/4chan_x.user.js
index c6ab64da6..8a649ac97 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -754,15 +754,16 @@
         }
       }
       post = {
+        el: bq.parentNode,
         threadId: threadID,
-        quotes: quotes,
+        quotes: bq.getElementsByClassName('quotelink'),
         backlinks: []
       };
+      if (conf['Resurrect Quotes']) DeadQuotes.node(post);
       if (conf['Quote Preview']) QuotePreview.node(post);
       if (conf['Quote Inline']) QuoteInline.node(post);
       if (conf['Indicate OP quote']) QuoteOP.node(post);
-      if (conf['Indicate Cross-thread Quotes']) QuoteCT.node(post);
-      if (conf['Resurrect Quotes']) return DeadQuotes.node(post);
+      if (conf['Indicate Cross-thread Quotes']) return QuoteCT.node(post);
     }
   };
 
diff --git a/script.coffee b/script.coffee
index 75d95896e..14b1cea54 100644
--- a/script.coffee
+++ b/script.coffee
@@ -652,9 +652,12 @@ ExpandComment =
       if quote.getAttribute('href') is quote.hash
         quote.pathname = "/#{g.BOARD}/res/#{threadID}"
     post =
+      el:        bq.parentNode
       threadId:  threadID
-      quotes:    quotes
+      quotes:    bq.getElementsByClassName 'quotelink'
       backlinks: []
+    if conf['Resurrect Quotes']
+      DeadQuotes.node   post
     if conf['Quote Preview']
       QuotePreview.node post
     if conf['Quote Inline']
@@ -663,8 +666,6 @@ ExpandComment =
       QuoteOP.node      post
     if conf['Indicate Cross-thread Quotes']
       QuoteCT.node      post
-    if conf['Resurrect Quotes']
-      DeadQuotes.node   post
 
 ExpandThread =
   init: ->