diff --git a/src/main/java/com/drtshock/playervaults/PlayerVaults.java b/src/main/java/com/drtshock/playervaults/PlayerVaults.java
index 81f48ad..9330ffc 100644
--- a/src/main/java/com/drtshock/playervaults/PlayerVaults.java
+++ b/src/main/java/com/drtshock/playervaults/PlayerVaults.java
@@ -126,8 +126,10 @@ public class PlayerVaults extends JavaPlugin {
                 Inventory inventory = player.getOpenInventory().getTopInventory();
                 if (inventory.getViewers().size() == 1) {
                     VaultViewInfo info = this.inVault.get(player.getUniqueId().toString());
-                    UUIDVaultManager.getInstance().saveVault(inventory, player.getUniqueId().toString(), info.getNumber());
+                    VaultManager.getInstance().saveVault(inventory, player.getUniqueId(), info.getNumber());
                     this.openInventories.remove(info.toString());
+                    // try this to make sure that they can't make further edits if the process hangs.
+                    player.closeInventory();
                 }
 
                 this.inVault.remove(player.getUniqueId().toString());