diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java
index 458f54f9bb..93d1ef6b94 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java
@@ -47,7 +47,7 @@ public class Barista {
 		this.coldDrinkDelay = coldDrinkDelay;
 	}
 
-	@ServiceActivator(inputChannel="hotDrinks", outputChannel="preparedDrinks")
+	@ServiceActivator(inputChannel="hotDrinkBarista", outputChannel="preparedDrinks")
 	public Drink prepareHotDrink(OrderItem orderItem) {
 		try {
 			Thread.sleep(this.hotDrinkDelay);
@@ -62,7 +62,7 @@ public class Barista {
 		}
 	}
 
-	@ServiceActivator(inputChannel="coldDrinks", outputChannel="preparedDrinks")
+	@ServiceActivator(inputChannel="coldDrinkBarista", outputChannel="preparedDrinks")
 	public Drink prepareColdDrink(OrderItem orderItem) {
 		try {
 			Thread.sleep(this.coldDrinkDelay);
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
index 6cd7436ae1..942e34edb9 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
@@ -21,17 +21,24 @@
 
 	<channel id="orders"/>
 	<channel id="drinks"/>
-
-	<channel id="coldDrinks">
-		<queue capacity="10"/>
-	</channel>
-
-	<channel id="hotDrinks">
-		<queue capacity="10"/>
-	</channel>
-
+	<channel id="coldDrinks"><queue capacity="10"/></channel>
+	<channel id="hotDrinks"><queue capacity="10"/></channel>
+	<channel id="coldDrinkBarista"/>
+	<channel id="hotDrinkBarista"/>
     <channel id="preparedDrinks"/>
 
+	<bridge input-channel="coldDrinks" output-channel="coldDrinkBarista">
+		<poller>
+			<interval-trigger interval="1000"/>
+		</poller>
+	</bridge>
+
+	<bridge input-channel="hotDrinks" output-channel="hotDrinkBarista">
+		<poller>
+			<interval-trigger interval="1000"/>
+		</poller>
+	</bridge>
+
 	<stream:stdout-channel-adapter id="deliveries"/>
 	
 </beans:beans>
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
index be01b4f929..6777d9ecc3 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
@@ -74,7 +74,7 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 		if (StringUtils.hasText(inputChannelName)) {
 			MessageChannel inputChannel = this.channelResolver.resolveChannelName(inputChannelName);
 			Assert.notNull(inputChannel, "failed to resolve inputChannel '" + inputChannelName + "'");
-			Assert.isInstanceOf(SubscribableChannel.class, inputChannel,
+			Assert.isTrue(inputChannel instanceof SubscribableChannel,
 					"The input channel for an Annotation-based endpoint must be a SubscribableChannel.");
 			endpoint = new EventDrivenConsumer((SubscribableChannel) inputChannel, handler);
 			if (handler instanceof BeanFactoryAware) {