diff --git a/.gitignore b/.gitignore
index 5a73b9a..988f9e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ config.yml
 src/com/matejdro/
 /dependency-reduced-pom.xml
 /global.yml
+/data.yml
diff --git a/src/main/java/com/graywolf336/jail/PrisonerManager.java b/src/main/java/com/graywolf336/jail/PrisonerManager.java
index 920b6ab..7f204a8 100644
--- a/src/main/java/com/graywolf336/jail/PrisonerManager.java
+++ b/src/main/java/com/graywolf336/jail/PrisonerManager.java
@@ -377,6 +377,11 @@ public class PrisonerManager {
 		}
 		
 		//Now, let's restore their inventory
+		//First up, clear their inventory
+		player.closeInventory();
+		player.getInventory().setArmorContents(null);
+		player.getInventory().clear();
+		
 		//if the cell isn't null, let's check if the cell has a chest and if so then try out best to restore
 		//the prisoner's inventory from that
 		if(cell != null) {