diff --git a/example-projects/fe2o3-amqp-example/src/main.rs b/example-projects/fe2o3-amqp-example/src/main.rs
index 3aa5ed1..f4fab61 100644
--- a/example-projects/fe2o3-amqp-example/src/main.rs
+++ b/example-projects/fe2o3-amqp-example/src/main.rs
@@ -3,8 +3,11 @@
 //! You need a running AMQP 1.0 broker to try out this example.
 //! With docker: docker run -it --rm -e ARTEMIS_USERNAME=guest -e ARTEMIS_PASSWORD=guest -p 5672:5672 vromero/activemq-artemis
 
-use cloudevents::{binding::fe2o3_amqp::EventMessage, Event, EventBuilderV10, EventBuilder, message::MessageDeserializer};
-use fe2o3_amqp::{Connection, Sender, Receiver, types::messaging::Message, Session};
+use cloudevents::{
+    binding::fe2o3_amqp::EventMessage, message::MessageDeserializer, Event, EventBuilder,
+    EventBuilderV10,
+};
+use fe2o3_amqp::{types::messaging::Message, Connection, Receiver, Sender, Session};
 use serde_json::json;
 
 type BoxError = Box<dyn std::error::Error>;
@@ -15,12 +18,12 @@ async fn send_event(sender: &mut Sender, i: usize) -> Result<()> {
         .id(i.to_string())
         .ty("example.test")
         .source("localhost")
+        .extension("ext-name", "AMQP")
         .data("application/json", json!({"hello": "world"}))
         .build()?;
-    let event_message = EventMessage::from_structured_event(event)?;
+    let event_message = EventMessage::from_binary_event(event)?;
     let message = Message::from(event_message);
-    sender.send(message).await?
-        .accepted_or("not accepted")?;
+    sender.send(message).await?.accepted_or("not accepted")?;
     Ok(())
 }
 
@@ -43,7 +46,9 @@ async fn main() {
             .unwrap();
     let mut session = Session::begin(&mut connection).await.unwrap();
     let mut sender = Sender::attach(&mut session, "sender", "q1").await.unwrap();
-    let mut receiver = Receiver::attach(&mut session, "receiver", "q1").await.unwrap();
+    let mut receiver = Receiver::attach(&mut session, "receiver", "q1")
+        .await
+        .unwrap();
 
     send_event(&mut sender, 1).await.unwrap();
     let event = recv_event(&mut receiver).await.unwrap();
diff --git a/src/binding/fe2o3_amqp/deserializer.rs b/src/binding/fe2o3_amqp/deserializer.rs
index 9c0c5f3..b3d74f3 100644
--- a/src/binding/fe2o3_amqp/deserializer.rs
+++ b/src/binding/fe2o3_amqp/deserializer.rs
@@ -59,6 +59,9 @@ impl BinaryDeserializer for EventMessage {
                         let value = MessageAttributeValue::try_from(value)?;
                         serializer = serializer.set_extension(key, value)?;
                     }
+                } else {
+                    let value = MessageAttributeValue::try_from(value)?;
+                    serializer = serializer.set_extension(&key, value)?;
                 }
             }
         }