diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java
index d4c681b0fd..327b2fca7d 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java
@@ -26,19 +26,22 @@ import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.integration.filter.MethodInvokingSelector;
 import org.springframework.util.StringUtils;
 
 /**
  * Parser for the <selector-chain/> element.
  * 
  * @author Mark Fisher
+ * @author Iwein Fuld
  */
 public class SelectorChainParser extends AbstractSingleBeanDefinitionParser {
 
 	private static final String SELECTOR_CHAIN_CLASSNAME = IntegrationNamespaceUtils.BASE_PACKAGE
 			+ ".selector.MessageSelectorChain";
 
+	private static final String METHODINVOKING_SELECTOR_CLASSNAME = IntegrationNamespaceUtils.BASE_PACKAGE
+			+ ".filter.MethodInvokingSelector";
+
 	@Override
 	protected String getBeanClassName(Element element) {
 		return SELECTOR_CHAIN_CLASSNAME;
@@ -79,18 +82,17 @@ public class SelectorChainParser extends AbstractSingleBeanDefinitionParser {
 	}
 
 	private RuntimeBeanReference buildSelectorChain(ParserContext parserContext, Node child) {
-		BeanDefinitionBuilder nestedBuilder = BeanDefinitionBuilder
-				.genericBeanDefinition(SELECTOR_CHAIN_CLASSNAME);
+		BeanDefinitionBuilder nestedBuilder = BeanDefinitionBuilder.genericBeanDefinition(SELECTOR_CHAIN_CLASSNAME);
 		this.parseSelectorChain(nestedBuilder, (Element) child, parserContext);
-		String nestedBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName(nestedBuilder
-				.getBeanDefinition(), parserContext.getRegistry());
+		String nestedBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName(nestedBuilder.getBeanDefinition(),
+				parserContext.getRegistry());
 		RuntimeBeanReference built = new RuntimeBeanReference(nestedBeanName);
 		return built;
 	}
 
 	private RuntimeBeanReference buildMethodInvokingSelector(ParserContext parserContext, String ref, String method) {
 		BeanDefinitionBuilder methodInvokingSelectorBuilder = BeanDefinitionBuilder
-				.genericBeanDefinition(MethodInvokingSelector.class);
+				.genericBeanDefinition(METHODINVOKING_SELECTOR_CLASSNAME);
 		methodInvokingSelectorBuilder.addConstructorArgValue(new RuntimeBeanReference(ref));
 		methodInvokingSelectorBuilder.addConstructorArgValue(method);
 		RuntimeBeanReference selector = new RuntimeBeanReference(BeanDefinitionReaderUtils.registerWithGeneratedName(