                :receive-msg-new-upstream-node
                :node node
                :upstream-node-contact-address upstream-node-contact-address)
-  [(update node :upstream maybe-conj (get-in node [:self :id]) upstream-node-contact-address)
+  [(update node :upstream
+           maybe-conj
+           (networked-node->node-contact-address node)
+           upstream-node-contact-address)
    []])
 
 (s/defn send-msg-new-upstream-node :- MessageEnvelopeSchema

               :receive-msg-forwarded-subscription
               :node node
               :subscriber-contact-address subscriber-contact-address)
  (let [self-id (get-in node [:self :id])]
    (if (and (not= self-id subscriber-contact-address)
             (not (downstream subscriber-contact-address))
             ;; The subscription id is not for this node itself, and

  [:message-envelope
   upstream-node-contact-address
   :new-upstream-node
   (networked-node->node-contact-address node)
   (*get-envelope-id*)])

(s/defmethod receive-msg :forwarded-subscription :- CommUpdateSchema
