diff --git a/src/runtime2/scheduler.rs b/src/runtime2/scheduler.rs
index 50329ff5cfc43f4f43ca9f68633c9bdcfd98c638..60626e93624e74d23fdd3ea1d7cc795385b9295f 100644
--- a/src/runtime2/scheduler.rs
+++ b/src/runtime2/scheduler.rs
@@ -154,7 +154,7 @@ impl Scheduler {
 
                             // And respond with an Ack
                             let ack_message = MessageFancy::Control(ControlMessageFancy{
-                                id: content.id,
+                                id: message.id,
                                 sending_component_id: connector_id,
                                 content: ControlContent::Ack,
                             });
@@ -168,7 +168,7 @@ impl Scheduler {
 
                             // Send an Ack
                             let ack_message = MessageFancy::Control(ControlMessageFancy{
-                                id: content.id,
+                                id: message.id,
                                 sending_component_id: connector_id,
                                 content: ControlContent::Ack,
                             });
@@ -176,7 +176,7 @@ impl Scheduler {
                             self.runtime.send_message(message.sending_component_id, ack_message);
                         },
                         ControlContent::Ack => {
-                            scheduled.router.handle_ack(content.id);
+                            scheduled.router.handle_ack(message.id);
                         },
                         ControlContent::Ping => {},
                     }
@@ -506,7 +506,7 @@ impl<'a> Iterator for MessagesIter<'a> {
                 if message.data_header.target_port == self.match_port_id {
                     // Found a match
                     self.next_index += 1;
-                    return Some(data_message);
+                    return Some(message);
                 }
             } else {
                 // Unreachable because: