diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionPropertyResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionPropertyResolver.java
index e49d3c2e..591e87b0 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionPropertyResolver.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionPropertyResolver.java
@@ -133,11 +133,11 @@ public class FlowExecutionPropertyResolver extends PropertyResolver {
 		}
 		FlowExecution execution = (FlowExecution) base;
 		if (FLASH_SCOPE_PROPERTY.equals(property)) {
-			return execution.getActiveSession().getScope().asMap();
-		} else if (FLOW_SCOPE_PROPERTY.equals(property)) {
-			return execution.getConversationScope().asMap();
-		} else if (CONVERSATION_SCOPE_PROPERTY.equals(property)) {
 			return execution.getActiveSession().getFlashMap().asMap();
+		} else if (FLOW_SCOPE_PROPERTY.equals(property)) {
+			return execution.getActiveSession().getFlashMap().asMap();
+		} else if (CONVERSATION_SCOPE_PROPERTY.equals(property)) {
+			return execution.getConversationScope().asMap();
 		} else {
 			// perform an attribute search
 			String attributeName = (String)property;