diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
index 2e719e2..19c85c7 100644
--- a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
+++ b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
@@ -134,6 +134,7 @@ public class JavaParser  extends Parser<JavaFile> {
 //		tokenizer.getTokens().addAll(build("(","ab","=","(","cd","&","(","ay","/","34",")",")",")"));
 //		tokenizer.getTokens().addAll(build("(","ab","=","cd",")"));
 //		tokenizer.getTokens().addAll(build("(","ab",")"));
+//		tokenizer.getTokens().addAll(build("ab","=","cd","/","ef"));
 		value_q0.seed(tokenizer, null);
 		System.out.println("----");
 		
diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/Value.java b/src/be/jeffcheasey88/peeratcode/parser/java/Value.java
index 861b220..4df347c 100644
--- a/src/be/jeffcheasey88/peeratcode/parser/java/Value.java
+++ b/src/be/jeffcheasey88/peeratcode/parser/java/Value.java
@@ -36,8 +36,8 @@ public class Value extends JavaElement{
 		private Token type; //make a concat later
 		
 		public BiValue(Value left, Value right, Token operation){
-			this.left = left;
-			this.right = right;
+			this.left = left.get() == null ? left : left.get();
+			this.right = right.get() == null ? right : right.get();
 			
 			this.type = operation;
 			System.out.println(this);