diff --git a/spring-webflow-samples/booking-mvc/.springWebflow b/spring-webflow-samples/booking-mvc/.springWebflow
index 7b439282..f0a803c5 100755
--- a/spring-webflow-samples/booking-mvc/.springWebflow
+++ b/spring-webflow-samples/booking-mvc/.springWebflow
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <webflow-project-description>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.1.0.v200808011800]]></pluginVersion>
+	<pluginVersion><![CDATA[2.2.0.v200809261800]]></pluginVersion>
 	<configs>
 		<config>
-			<file>src/main/webapp/WEB-INF/hotels/booking/booking.xml</file>
-			<name><![CDATA[booking]]></name>
+			<file>src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml</file>
+			<name><![CDATA[booking-flow]]></name>
 		</config>
 	</configs>
 </webflow-project-description>
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/validation/ValidationHelper.java b/spring-webflow/src/main/java/org/springframework/webflow/validation/ValidationHelper.java
index 41e7079a..86641802 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/validation/ValidationHelper.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/validation/ValidationHelper.java
@@ -143,6 +143,7 @@ public class ValidationHelper {
 
 	private boolean invokeModelValidator(Object model, Object validator) {
 		if (validator instanceof Validator) {
+			// TODO - fallback to validator last not first
 			// existing validator, just invoke it
 			MessageContextErrors errors = new MessageContextErrors(requestContext.getMessageContext(), modelName,
 					model, expressionParser, mappingResults);
@@ -159,8 +160,8 @@ public class ValidationHelper {
 
 	private boolean invokeValidatorValidateMethodForCurrentState(Object model, Object validator) {
 		String methodName = "validate" + StringUtils.capitalize(requestContext.getCurrentState().getId());
-		Method validateMethod = ReflectionUtils.findMethod(validator.getClass(), methodName,
-				new Class[] { ValidationContext.class });
+		Method validateMethod = ReflectionUtils.findMethod(validator.getClass(), methodName, new Class[] {
+				model.getClass(), ValidationContext.class });
 		if (validateMethod != null) {
 			ReflectionUtils.invokeMethod(validateMethod, validator, new Object[] { model,
 					new DefaultValidationContext(requestContext, eventId, mappingResults) });
@@ -175,10 +176,11 @@ public class ValidationHelper {
 			ReflectionUtils.invokeMethod(validateMethod, validator, new Object[] { model, errors });
 			return true;
 		}
-		validateMethod = ReflectionUtils.findMethod(validator.getClass(), methodName,
-				new Class[] { MessageContext.class });
+		validateMethod = ReflectionUtils.findMethod(validator.getClass(), methodName, new Class[] { model.getClass(),
+				MessageContext.class });
 		if (validateMethod != null) {
-			ReflectionUtils.invokeMethod(validateMethod, model, new Object[] { requestContext.getMessageContext() });
+			ReflectionUtils.invokeMethod(validateMethod, validator, new Object[] { model,
+					requestContext.getMessageContext() });
 			return true;
 		}
 		return false;
@@ -188,8 +190,8 @@ public class ValidationHelper {
 		Method validateMethod = ReflectionUtils.findMethod(validator.getClass(), "validate", new Class[] {
 				model.getClass(), ValidationContext.class });
 		if (validateMethod != null) {
-			ReflectionUtils.invokeMethod(validateMethod, model, new Object[] { new DefaultValidationContext(
-					requestContext, eventId, mappingResults) });
+			ReflectionUtils.invokeMethod(validateMethod, validator, new Object[] { model,
+					new DefaultValidationContext(requestContext, eventId, mappingResults) });
 			return true;
 		} else {
 			return false;