diff --git a/Minecraft.World/ObsidianTile.cpp b/Minecraft.World/ObsidianTile.cpp
index 36390d47..64ac7064 100644
--- a/Minecraft.World/ObsidianTile.cpp
+++ b/Minecraft.World/ObsidianTile.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ObsidianTile.h"
 
-ObsidianTile::ObsidianTile(int id) : StoneTile(id)
+ObsidianTile::ObsidianTile(int id) : Tile(id, Material::stone)
 {
 }
 
diff --git a/Minecraft.World/ObsidianTile.h b/Minecraft.World/ObsidianTile.h
index 6bf23edf..7c4d35eb 100644
--- a/Minecraft.World/ObsidianTile.h
+++ b/Minecraft.World/ObsidianTile.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "StoneTile.h"
+#include "Tile.h"
 
 class Random;
 
-class ObsidianTile : public StoneTile
+class ObsidianTile : public Tile
 {
 public:
 	ObsidianTile(int id);
diff --git a/Minecraft.World/StoneTile.cpp b/Minecraft.World/StoneTile.cpp
index eefced6c..0f5f1671 100644
--- a/Minecraft.World/StoneTile.cpp
+++ b/Minecraft.World/StoneTile.cpp
@@ -28,8 +28,22 @@ unsigned int StoneTile::getDescriptionId(int iData)
 	return STONE_NAMES[iData];
 }
 
+int StoneTile::getResource(int data, Random* random, int playerBonusLevel)
+{
+
+	if (data < 0 || data >= STONE_NAMES_LENGTH) data = 0;
+
+	if (data == 0) {
+		return Tile::cobblestone_Id;
+	}
+
+	return Tile::stone_Id;
+}
+
 int StoneTile::getSpawnResourcesAuxValue(int data)
 {
+	if (data < 0 || data >= STONE_NAMES_LENGTH) data = 0;
+
 	return data;
 }
 
diff --git a/Minecraft.World/StoneTile.h b/Minecraft.World/StoneTile.h
index 8dcf1674..75fc9892 100644
--- a/Minecraft.World/StoneTile.h
+++ b/Minecraft.World/StoneTile.h
@@ -23,6 +23,7 @@ public:
 	StoneTile(int id);
 	virtual Icon* getTexture(int face, int data);
 	virtual unsigned int getDescriptionId(int iData = -1);
+	virtual int getResource(int data, Random* random, int playerBonusLevel);
 	virtual int getSpawnResourcesAuxValue(int data);
 	void registerIcons(IconRegister* iconRegister);
 };
\ No newline at end of file