diff --git a/spring-webflow/src/main/java/org/springframework/webflow/upgrade/spring-webflow-1.0-to-2.0.xsl b/spring-webflow/src/main/java/org/springframework/webflow/upgrade/spring-webflow-1.0-to-2.0.xsl
index 49306a19..7d8c2d65 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/upgrade/spring-webflow-1.0-to-2.0.xsl
+++ b/spring-webflow/src/main/java/org/springframework/webflow/upgrade/spring-webflow-1.0-to-2.0.xsl
@@ -389,7 +389,7 @@
                 </xsl:attribute>
             </xsl:if>
         </xsl:if>
-        <xsl:if test="(local-name(../..) = 'flow' and local-name(..) = 'output-mapper') or (local-name(../../..) = 'subflow-state' and local-name(..) = 'input-mapper') or (local-name(../../..) = 'end-state' and local-name(..) = 'output-mapper')">
+        <xsl:if test="(local-name(../..) = 'flow' and local-name(..) = 'output-mapper') or (local-name(../../..) = 'subflow-state' and local-name(..) = 'input-mapper') or (local-name(../..) = 'end-state' and local-name(..) = 'output-mapper')">
             <xsl:if test="@target">
                 <xsl:attribute name="name">
                     <xsl:variable name="stripElParam">
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/upgrade/WebFlowUpgraderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/upgrade/WebFlowUpgraderTests.java
new file mode 100644
index 00000000..d0ab999b
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/upgrade/WebFlowUpgraderTests.java
@@ -0,0 +1,13 @@
+package org.springframework.webflow.upgrade;
+
+import junit.framework.TestCase;
+
+import org.springframework.core.io.ClassPathResource;
+
+public class WebFlowUpgraderTests extends TestCase {
+	public void testConvertFlow1() {
+		WebFlowUpgrader upgrader = new WebFlowUpgrader();
+		String result = upgrader.convert(new ClassPathResource("flow1.xml", getClass()));
+		System.out.println(result);
+	}
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/upgrade/flow1.xml b/spring-webflow/src/test/java/org/springframework/webflow/upgrade/flow1.xml
new file mode 100644
index 00000000..b156b22f
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/upgrade/flow1.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<flow xmlns="http://www.springframework.org/schema/webflow"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow
+                          http://www.springframework.org/schema/webflow/spring-webflow-1.0.xsd">
+
+	<var name="list" class="java.util.ArrayList" />
+
+	<start-state idref="displayItemlist" />
+
+	<view-state id="displayItemlist" view="itemlist">
+		<transition on="add" to="addItem" />
+	</view-state>
+
+	<subflow-state id="addItem" flow="item">
+		<attribute-mapper>
+			<output-mapper>
+				<mapping source="item" target-collection="flowScope.list" />
+			</output-mapper>
+		</attribute-mapper>
+		<transition on="finish" to="displayItemlist" />
+	</subflow-state>
+
+	<inline-flow id="item">
+		<flow>
+			<start-state idref="displayItem"/>
+			
+			<view-state id="displayItem" view="item">
+				<transition on="submit" to="finish" />
+			</view-state>
+
+			<end-state id="finish">
+				<output-mapper>
+					<mapping source="requestParameters.data" target="item" />
+				</output-mapper>
+			</end-state>
+		</flow>
+	</inline-flow>
+
+</flow>