diff --git a/src/jrummikub/model/StoneHeap.java b/src/jrummikub/model/StoneHeap.java
index 4ccb427..12dcc21 100644
--- a/src/jrummikub/model/StoneHeap.java
+++ b/src/jrummikub/model/StoneHeap.java
@@ -30,9 +30,9 @@ public class StoneHeap {
 		
 		ArrayList<StoneColor> jokerColors = new ArrayList<StoneColor>(Arrays.asList(StoneColor.values()));
 		
-		StoneColor temp = jokerColors.get(0);
-		jokerColors.set(0, jokerColors.get(2));
-		jokerColors.set(2, temp);
+		StoneColor temp = jokerColors.get(1);
+		jokerColors.set(1, jokerColors.get(3));
+		jokerColors.set(3, temp);
 		
 		int jokersLeft = gameSettings.getJokerNumber();
 		done : while(true) {