diff --git a/build-tools/build-indexes b/build-tools/build-indexes
index 1683d8fd5..41eeac9c6 100755
--- a/build-tools/build-indexes
+++ b/build-tools/build-indexes
@@ -632,7 +632,7 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
 				if (isNatDex) {
 					let curItem = item;
 					let curGen = genNum;
-					while (item.isNonstandard && curGen >= 7) {
+					while (curItem.isNonstandard && curGen >= 7) {
 						curItem = Dex.forGen(curGen).items.get(item.id);
 						curGen--;
 					}
@@ -740,6 +740,7 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
 			case 'souldew':
 			// falls through
 			// Other
+			case 'leek':
 			case 'stick':
 			case 'thickclub':
 			case 'lightball':