diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
index 0ef723dda8..c1ce5cb301 100755
--- a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
+++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
@@ -223,8 +223,8 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC
 
         // Allows the options on the destination to configure the consumerInfo
         if (dest.getOptions() != null) {
-            Map<String, String> options = new HashMap<String, String>(dest.getOptions());
-            IntrospectionSupport.setProperties(this.info, options, "consumer.");
+            Map<String, Object> options = IntrospectionSupport.extractProperties(dest.getOptions(), "producer.");
+            IntrospectionSupport.setProperties(this.info, options);
             if (options.size() > 0) {
                 String msg = "There are " + options.size()
                     + " consumer options that couldn't be set on the consumer."
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
index ac7ea3c41a..7c4018c7ee 100755
--- a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
+++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
@@ -87,8 +87,8 @@ public class ActiveMQMessageProducer extends ActiveMQMessageProducerSupport impl
         this.info.setWindowSize(session.connection.getProducerWindowSize());
         // Allows the options on the destination to configure the producerInfo
         if (destination != null && destination.getOptions() != null) {
-            Map<String, String> options = new HashMap<String, String>(destination.getOptions());
-            IntrospectionSupport.setProperties(this.info, options, "producer.");
+            Map<String, Object> options = IntrospectionSupport.extractProperties(destination.getOptions(), "producer.");
+            IntrospectionSupport.setProperties(this.info, options);
             if (options.size() > 0) {
                 String msg = "There are " + options.size()
                     + " producer options that couldn't be set on the producer."