diff --git a/src/jrummikub/model/StoneSet.java b/src/jrummikub/model/StoneSet.java
index 2fd8e96..8dece46 100644
--- a/src/jrummikub/model/StoneSet.java
+++ b/src/jrummikub/model/StoneSet.java
@@ -78,12 +78,7 @@ public class StoneSet implements Iterable<Stone>, Sizeable {
 		if (nonJoker2 == -1) {
 			// Z first
 			if (nonJoker1 == 0 && stones.get(nonJoker1).getValue() < 12) {
-				int origValue = stones.get(nonJoker1).getValue();
-				int value = 0;
-				for (int i = 0; i < stones.size(); i++) {
-					value += origValue + i;
-				}
-				return new Pair<Type, Integer>(RUN, value);
+				return new Pair<Type, Integer>(RUN, isValidRun(nonJoker1));
 			} else {
 				int value = stones.get(nonJoker1).getValue() * stones.size();
 				return new Pair<Type, Integer>(GROUP, value);