diff --git a/aquatic_udp/src/lib/glommio/handlers.rs b/aquatic_udp/src/lib/glommio/handlers.rs
index c9b0316..3d52f93 100644
--- a/aquatic_udp/src/lib/glommio/handlers.rs
+++ b/aquatic_udp/src/lib/glommio/handlers.rs
@@ -30,7 +30,7 @@ pub async fn run_request_worker(
     let mut stream = empty().boxed_local();
 
     for (_, receiver) in request_receivers.streams() {
-        stream = Box::pin(stream.race(receiver));
+        stream = Box::pin(stream.or(receiver));
     }
 
     while let Some((producer_index, request, addr)) = stream.next().await {
diff --git a/aquatic_udp/src/lib/glommio/network.rs b/aquatic_udp/src/lib/glommio/network.rs
index f685e8f..daa9a2d 100644
--- a/aquatic_udp/src/lib/glommio/network.rs
+++ b/aquatic_udp/src/lib/glommio/network.rs
@@ -68,7 +68,9 @@ async fn read_requests(
     let valid_until = ValidUntil::new(config.cleaning.max_connection_age);
     let access_list_mode = config.access_list.mode;
 
+    // Needs to be updated periodically: use timer?
     let access_list = AccessList::default();
+    // Needs to be cleaned periodically: use timer?
     let mut connections = ConnectionMap::default();
 
     let mut buf = [0u8; 2048];
@@ -164,7 +166,7 @@ async fn send_responses(
     let mut stream = local_receiver.stream().boxed_local();
 
     for (_, receiver) in response_receivers.streams().into_iter() {
-        stream = Box::pin(stream.race(receiver.map(|(response, addr)| (response.into(), addr))));
+        stream = Box::pin(stream.or(receiver.map(|(response, addr)| (response.into(), addr))));
     }
 
     while let Some((response, src)) = stream.next().await {