Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
===================================================================
diff -u -r309a597eada52a4079f2985e0d97beedf9adda42 -r2927201b0bf594425125fac209db2815fb0f4412
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java	(.../BranchCondition.java)	(revision 309a597eada52a4079f2985e0d97beedf9adda42)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java	(.../BranchCondition.java)	(revision 2927201b0bf594425125fac209db2815fb0f4412)
@@ -346,8 +346,11 @@
 				return false; 
 			}
 
-			if ( typedStartValue != null && ( typedEndValue == null || typedEndValue.compareTo(typedStartValue) >= 0 ) ) {
+			if ( typedStartValue == null && typedEndValue != null ) 
 				return true;
+			
+			else if ( typedEndValue == null || typedEndValue.compareTo(typedStartValue) >= 0 ) {
+				return true;
 			}
 		}
 		return false;
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
===================================================================
diff -u -r36c95f28c887810cf5c22f0434a8852d26fbb068 -r2927201b0bf594425125fac209db2815fb0f4412
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java	(.../BranchConditionDTO.java)	(revision 36c95f28c887810cf5c22f0434a8852d26fbb068)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java	(.../BranchConditionDTO.java)	(revision 2927201b0bf594425125fac209db2815fb0f4412)
@@ -36,12 +36,6 @@
  */
 public class BranchConditionDTO {
 
-	/** If a range is open ended e.g. starts at zero and has no end value then Flash needs a maximum value for endValue 
-	 * so that it can render a stepper. So set the max value to 9999 on the way out, and convert it back to null
-	 * on the way in. This logic is also used for the ToolOutputDefinitionDTO.
-	 */
-	public static String MAX_FOR_FLASH = "9999";
-	
 	private Long conditionId;
 	private Integer conditionUIID;
     private Integer orderID; 
@@ -63,9 +57,6 @@
 
     	this.startValue = condition.getStartValue();
     	this.endValue = condition.getEndValue();
-		if ( startValue != null && endValue == null ) {
-			endValue = BranchConditionDTO.MAX_FOR_FLASH;
-		}
 
     	this.exactMatchValue = condition.getExactMatchValue();
     	this.toolActivityUIID = toolActivityUIID;
Index: lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
===================================================================
diff -u -r36c95f28c887810cf5c22f0434a8852d26fbb068 -r2927201b0bf594425125fac209db2815fb0f4412
--- lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java	(.../ToolOutputDefinitionDTO.java)	(revision 36c95f28c887810cf5c22f0434a8852d26fbb068)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java	(.../ToolOutputDefinitionDTO.java)	(revision 2927201b0bf594425125fac209db2815fb0f4412)
@@ -53,9 +53,6 @@
 
 		this.startValue = startValue;
 		this.endValue = endValue;
-		if ( startValue != null && endValue == null ) {
-			endValue = BranchConditionDTO.MAX_FOR_FLASH;
-		}
 
 		this.complexDefinition = complexDefinition;
 	}
@@ -68,9 +65,6 @@
 
 		this.startValue = (definition.getStartValue() != null) ? definition.getStartValue().toString() : null;
 		this.endValue = (definition.getEndValue() != null) ? definition.getEndValue().toString() : null;
-		if ( startValue != null && endValue == null ) {
-			endValue = BranchConditionDTO.MAX_FOR_FLASH;
-		}
 
 		this.complexDefinition = (definition.getComplexDefinition() != null) ? definition.getComplexDefinition().toString() : null;
 	}