diff --git a/Towny/src/main/java/com/palmergames/bukkit/towny/object/economy/Account.java b/Towny/src/main/java/com/palmergames/bukkit/towny/object/economy/Account.java
index 8962771536..78f4b21dfd 100644
--- a/Towny/src/main/java/com/palmergames/bukkit/towny/object/economy/Account.java
+++ b/Towny/src/main/java/com/palmergames/bukkit/towny/object/economy/Account.java
@@ -172,11 +172,12 @@ public synchronized boolean payTo(double amount, Account collector, String reaso
 	 *
 	 * @return Bukkit world for the object
 	 */
-	@Deprecated
+	@Nullable
 	public World getBukkitWorld() {
-		return BukkitTools.getWorlds().get(0);
+		return getWorld().getBukkitWorld();
 	}
 	
+	@NotNull
 	public TownyWorld getWorld() {
 		return this.worldSupplier.get();
 	}