diff --git a/benches/deserialization_benchmark.rs b/benches/deserialization_benchmark.rs
index 74984d83..c79889f1 100644
--- a/benches/deserialization_benchmark.rs
+++ b/benches/deserialization_benchmark.rs
@@ -3,7 +3,7 @@ use criterion::{criterion_group, criterion_main};
 use criterion::{BatchSize, Criterion};
 use std::io::Cursor;
 
-use bromine::event::{Event};
+use bromine::event::Event;
 use tokio::runtime::Runtime;
 
 pub const EVENT_NAME: &str = "bench_event";
diff --git a/src/ipc/stream_emitter/emit_metadata_with_response_stream.rs b/src/ipc/stream_emitter/emit_metadata_with_response_stream.rs
index 339e9773..a0288de4 100644
--- a/src/ipc/stream_emitter/emit_metadata_with_response_stream.rs
+++ b/src/ipc/stream_emitter/emit_metadata_with_response_stream.rs
@@ -70,8 +70,8 @@ impl<P: IntoPayload + Send + Sync + 'static> Future for EmitMetadataWithResponse
                 .and_then(|m| m.ctx.clone()));
             let timeout = self
                 .timeout
-                .clone()
-                .unwrap_or(ctx.default_reply_timeout.clone());
+                .take()
+                .unwrap_or_else(|| ctx.default_reply_timeout.clone());
 
             let event_id = match poll_unwrap!(emit_metadata.event_metadata.as_mut()).get_event() {
                 Ok(e) => e.id(),