diff --git a/SPD-classes/src/main/java/com/watabou/utils/Random.java b/SPD-classes/src/main/java/com/watabou/utils/Random.java
index 385e3f118..7fe0a3891 100644
--- a/SPD-classes/src/main/java/com/watabou/utils/Random.java
+++ b/SPD-classes/src/main/java/com/watabou/utils/Random.java
@@ -22,7 +22,9 @@
 package com.watabou.utils;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 
 public class Random {
 
@@ -156,6 +158,10 @@ public class Random {
 			(T)collection.toArray()[Int( size )] :
 			null;
 	}
+
+	public static<T> void shuffle( List<?extends T> list){
+		Collections.shuffle(list, rand);
+	}
 	
 	public static<T> void shuffle( T[] array ) {
 		for (int i=0; i < array.length - 1; i++) {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java
index 8e2b895a2..e69b75559 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java
@@ -74,7 +74,7 @@ public abstract class RegularLevel extends Level {
 		
 		
 		ArrayList<Room> initRooms = initRooms();
-		Collections.shuffle(initRooms);
+		Random.shuffle(initRooms);
 		
 		do {
 			for (Room r : initRooms){
@@ -340,7 +340,7 @@ public abstract class RegularLevel extends Level {
 	}
 	
 	protected Room randomRoom( Class<?extends Room> type ) {
-		Collections.shuffle( rooms );
+		Random.shuffle( rooms );
 		for (Room r : rooms) {
 			if (type.isInstance(r)
 					//compatibility with pre-0.6.0 saves
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java
index 37f0a5ec0..7ba35d073 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java
@@ -274,7 +274,7 @@ public class ShopRoom extends SpecialRoom {
 		if (itemsToSpawn.size() > 63)
 			throw new RuntimeException("Shop attempted to carry more than 63 items!");
 
-		Collections.shuffle(itemsToSpawn);
+		Random.shuffle(itemsToSpawn);
 	}
 
 	private static void ChooseBag(Belongings pack){
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SpecialRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SpecialRoom.java
index 19c656bdb..cbf7978dc 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SpecialRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SpecialRoom.java
@@ -85,7 +85,7 @@ public class SpecialRoom extends Room {
 		}
 		
 		guaranteedWellDepth = Random.IntRange( 6, 14 );
-		Collections.shuffle(runSpecials);
+		Random.shuffle(runSpecials);
 	}
 	
 	public static void initForFloor(){