diff --git a/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java b/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java
index 95a27cf4..825661b6 100644
--- a/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java
+++ b/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java
@@ -461,7 +461,14 @@ public class ProtocolProcessorTest {
                 .messageId(100)
                 .build();
         m_processor.processPublish(m_channel, msg);
-        
+
+        Collection<IMessagesStore.StoredMessage> messages = m_messagesStore.searchMatching(new IMatchingCondition() {
+            public boolean match(String key) {
+                return  SubscriptionsStore.matchTopics(key, FAKE_TOPIC);
+            }
+        });
+        assertFalse(messages.isEmpty());
+
         //Exercise
         MqttPublishMessage cleanPubMsg = MessageBuilder.publish()
                 .topicName(FAKE_TOPIC)
@@ -473,7 +480,7 @@ public class ProtocolProcessorTest {
         m_processor.processPublish(m_channel, cleanPubMsg);
         
         //Verify
-        Collection<IMessagesStore.StoredMessage> messages = m_messagesStore.searchMatching(new IMatchingCondition() {
+        messages = m_messagesStore.searchMatching(new IMatchingCondition() {
             public boolean match(String key) {
                 return  SubscriptionsStore.matchTopics(key, FAKE_TOPIC);
             }
diff --git a/netty_parser/src/main/java/io/moquette/parser/proto/messages/PublishMessage.java b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PublishMessage.java
index cbe5ec2b..6afd83ab 100644
--- a/netty_parser/src/main/java/io/moquette/parser/proto/messages/PublishMessage.java
+++ b/netty_parser/src/main/java/io/moquette/parser/proto/messages/PublishMessage.java
@@ -42,7 +42,7 @@ public class PublishMessage extends MessageIDMessage {
     }
 
     public ByteBuffer getPayload() {
-        return m_payload;
+        return m_payload.duplicate();
     }
 
     public void setPayload(ByteBuffer payload) {