diff --git a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/Currency.java b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/Currency.java
index c474ea6..4451fe8 100644
--- a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/Currency.java
+++ b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/Currency.java
@@ -77,7 +77,7 @@ public class Currency {
      */
     public String formatAmount(BigDecimal amount) {
         return ChatColor.translateAlternateColorCodes('&',
-                MessageUtils.indexedFormat(this.balanceFormat, this.format.format(amount), amount.equals(BigDecimal.ONE) ? this.nameSingular : this.namePlural)
+                MessageUtils.indexedFormat(this.balanceFormat, this.format.format(amount), amount.compareTo(BigDecimal.ONE) == 0 ? this.nameSingular : this.namePlural)
         );
     }
 
diff --git a/SaneEconomyCore/src/test/java/org/appledash/saneeconomy/test/mock/MockSaneEconomy.java b/SaneEconomyCore/src/test/java/org/appledash/saneeconomy/test/mock/MockSaneEconomy.java
index 70b1c94..07077b6 100644
--- a/SaneEconomyCore/src/test/java/org/appledash/saneeconomy/test/mock/MockSaneEconomy.java
+++ b/SaneEconomyCore/src/test/java/org/appledash/saneeconomy/test/mock/MockSaneEconomy.java
@@ -6,6 +6,7 @@ import org.appledash.saneeconomy.economy.logger.TransactionLogger;
 import org.appledash.saneeconomy.vault.VaultHook;
 
 import java.util.Optional;
+import java.util.UUID;
 
 /**
  * Created by appledash on 9/18/16.
@@ -26,4 +27,9 @@ public class MockSaneEconomy implements ISaneEconomy {
     public VaultHook getVaultHook() {
         return null;
     }
+
+    @Override
+    public String getLastName(UUID uuid) {
+        return uuid.toString();
+    }
 }