diff --git a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/gateway/RabbitStockServiceGateway.java b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/gateway/RabbitStockServiceGateway.java
index 5b5058a..852ecd0 100644
--- a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/gateway/RabbitStockServiceGateway.java
+++ b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/gateway/RabbitStockServiceGateway.java
@@ -20,7 +20,6 @@ import java.io.UnsupportedEncodingException;
 import java.util.UUID;
 
 import org.springframework.amqp.AmqpException;
-import org.springframework.amqp.core.Address;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessagePostProcessor;
 import org.springframework.amqp.rabbit.core.support.RabbitGatewaySupport;
@@ -42,7 +41,7 @@ public class RabbitStockServiceGateway extends RabbitGatewaySupport implements S
 	public void send(TradeRequest tradeRequest) {
 		getRabbitTemplate().convertAndSend(tradeRequest, new MessagePostProcessor() {
 			public Message postProcessMessage(Message message) throws AmqpException {
-				message.getMessageProperties().setReplyTo(new Address(defaultReplyTo));
+				message.getMessageProperties().setReplyTo(defaultReplyTo);
 				try {
 					message.getMessageProperties().setCorrelationId(UUID.randomUUID().toString().getBytes("UTF-8"));
 				}