        (handle-volumes spec endpoint instance-id)    
        (when-let [ip (get-in spec [:machine :ip])] 
          (debug (<<  "Associating existing ip ~{ip} to instance-id"))
-         (with-ctx (assoc-pub-ip endpoint instance-id ip)))
+         (assoc-pub-ip endpoint instance-id ip))
        (update-ip spec endpoint instance-id)
        (wait-for-ssh (pub-dns endpoint instance-id) user [5 :minute])
        (set-hostname spec endpoint instance-id user)

      (wait-for-status this "running" [5 :minute]) 
      (when-let [ip (get-in spec [:machine :ip])] 
        (debug (<<  "Associating existing ip ~{ip} to ~{instance-id}"))
        (with-ctx (assoc-pub-ip endpoint instance-id ip)))
      (update-ip spec endpoint instance-id)
      (wait-for-ssh (pub-dns endpoint instance-id) user [5 :minute])
      ))

  (stop [this]
    (with-instance-id 
       (debug "stopping" instance-id)
       (when-not (first (:addresses (describe-eip endpoint instance-id)))
         (debug "clearing dynamic ip from system")
         (s/update-system (spec :system-id) 
           (dissoc-in* (s/get-system (spec :system-id)) [:machine :ip])))
