diff --git a/src/main/java/io/github/overlordsiii/villagernames/util/VillagerUtil.java b/src/main/java/io/github/overlordsiii/villagernames/util/VillagerUtil.java
index 8fc429f..cfb99e0 100644
--- a/src/main/java/io/github/overlordsiii/villagernames/util/VillagerUtil.java
+++ b/src/main/java/io/github/overlordsiii/villagernames/util/VillagerUtil.java
@@ -52,12 +52,12 @@ private static String upperFirstLetter(String string){
 
     private static String pickRandomName(NamesConfig namesConfig) {
         List<String> names = namesConfig.getNameList();
-        int index = random.nextInt(names.size());
+        int index = random.nextInt(names.size() - 1);
         if (usedUpNames.size() > names.size()/2) {
             usedUpNames.clear();
         }
         if (usedUpNames.contains(names.get(index))) {
-            index = random.nextInt(names.size());//Partial random, but you could possibly choose a name in the list again
+            index = random.nextInt(names.size() - 1); // Partial random, but you could possibly choose a name in the list again
         }
         usedUpNames.add(names.get(index));
         return names.get(index);