diff --git a/src/modules/cars.ts b/src/modules/cars.ts
index 4da33af..b1cf247 100644
--- a/src/modules/cars.ts
+++ b/src/modules/cars.ts
@@ -110,7 +110,7 @@ export default class CarModule extends Module {
 			// Check opponents stamp target
 			// Will skip this if user's have Hall of Fame ghost registered
 			let carsChallengers;
-			let returnCount = 0;
+			let returnCount = 1;
 			let opponentTargetCount = 0;
 			if(registeredTarget === false)
 			{
@@ -123,15 +123,13 @@ export default class CarModule extends Module {
 						locked: 'desc'
 					}
 				})
-					
-				returnCount = 1;
-				
+
 				if(opponentTargetCount > 0)
 				{
 					console.log('Challengers Available');
 
 					// Randomize pick
-					let random: number = MersenneTwister.int(0, opponentTargetCount);
+					let random: number = MersenneTwister.int(0, opponentTargetCount - 1);
 
 					// Check opponents target
 					let opponentTarget = await prisma.carStampTarget.findMany({
diff --git a/src/modules/ghost.ts b/src/modules/ghost.ts
index 3246504..928650c 100644
--- a/src/modules/ghost.ts
+++ b/src/modules/ghost.ts
@@ -358,7 +358,8 @@ export default class GhostModule extends Module {
 			while(arr.length < maxNumber)
 			{ 
                 // Pick random car Id
-				let randomNumber = MersenneTwister.int(0, maxNumber-1);
+				let randomNumber = MersenneTwister.int(0, car.length-1);
+				
 				if(arr.indexOf(randomNumber) === -1)
 				{
                     // Push current number to array