diff --git a/src/Defines.h b/src/Defines.h
index b3dbcc93e..5b868b2e5 100644
--- a/src/Defines.h
+++ b/src/Defines.h
@@ -254,16 +254,18 @@ inline bool IsValidItem(int a_ItemType)
 
 
 
-inline bool IsBlockWater(BLOCKTYPE a_BlockType, bool a_IncludeFrozenWater = false)
+inline bool IsBlockWater(BLOCKTYPE a_BlockType)
 {
-	if (a_IncludeFrozenWater)
-	{
-		return ((a_BlockType == E_BLOCK_WATER) || (a_BlockType == E_BLOCK_STATIONARY_WATER) || (a_BlockType == E_BLOCK_ICE));
-	}
-	else
-	{
-		return ((a_BlockType == E_BLOCK_WATER) || (a_BlockType == E_BLOCK_STATIONARY_WATER));
-	}
+	return ((a_BlockType == E_BLOCK_WATER) || (a_BlockType == E_BLOCK_STATIONARY_WATER));
+}
+
+
+
+
+
+inline bool IsBlockWaterOrIce(BLOCKTYPE a_BlockType)
+{
+	return (IsBlockWater(a_BlockType) || (a_BlockType == E_BLOCK_ICE));
 }
 
 
diff --git a/src/World.cpp b/src/World.cpp
index f598874ea..d8850e78a 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -633,7 +633,7 @@ void cWorld::GenerateRandomSpawn(void)
 {
 	LOGD("Generating random spawnpoint...");
 
-	while (IsBlockWater(GetBlock((int)m_SpawnX, GetHeight((int)m_SpawnX, (int)m_SpawnZ), (int)m_SpawnZ), true))
+	while (IsBlockWaterOrIce(GetBlock((int)m_SpawnX, GetHeight((int)m_SpawnX, (int)m_SpawnZ), (int)m_SpawnZ)))
 	{
 		if ((GetTickRandomNumber(4) % 2) == 0) // Randomise whether to increment X or Z coords
 		{