diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java
index 296d7c7..fe687ee 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java
@@ -194,7 +194,6 @@ public class TileEntityRift extends TileEntity
 		if (count2 > 40)
 		{
 			this.invalidate();
-			worldObj.setBlockToAir(xCoord, yCoord, zCoord);
 			if (dimension.getLink(xCoord, yCoord, zCoord) != null)
 			{
 				if(!this.worldObj.isRemote)
@@ -202,6 +201,7 @@ public class TileEntityRift extends TileEntity
 					dimension.deleteLink(xCoord, yCoord, zCoord);
 				}
 				worldObj.playSound(xCoord, yCoord, zCoord, "mods.DimDoors.sfx.riftClose", (float) .7, 1, true);
+				worldObj.setBlockToAir(xCoord, yCoord, zCoord);
 			}	
 		}
 		count2++; 
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java
index 70c1f01..fc52d2f 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java
@@ -25,7 +25,6 @@ import StevenDimDoors.mod_pocketDim.util.Pair;
 import StevenDimDoors.mod_pocketDim.util.Point4D;
 import StevenDimDoors.mod_pocketDim.items.ItemDimensionalDoor;
 
-@SuppressWarnings("deprecation")
 public class PocketBuilder
 {
 	public static final int MIN_POCKET_SIZE = 5;
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java
index 6076122..2c54743 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java
@@ -42,7 +42,6 @@ public class PocketGenerator extends ChunkProviderGenerate
 	public Chunk provideChunk(int chunkX, int chunkZ)
 	{
 		byte[] var3 = new byte[32768];
-
 		Chunk chunk = new Chunk(worldObj, var3, chunkX, chunkZ);
 		
 		if(!chunk.isTerrainPopulated)
@@ -50,14 +49,13 @@ public class PocketGenerator extends ChunkProviderGenerate
 			chunk.isTerrainPopulated = true;
 			spawner.registerChunkForPopulation(worldObj.provider.dimensionId, chunkX, chunkZ);
 		}
-
 		return chunk;
 	}
 
 	@Override
 	public Chunk loadChunk(int var1, int var2) 
 	{
-		return super.loadChunk(var1, var2);
+		return this.provideChunk(var1, var2);
 	}
 
 	@Override