diff --git a/scripts/mash_run.sh b/scripts/mash_run.sh
index 65f3658..4fa421a 100755
--- a/scripts/mash_run.sh
+++ b/scripts/mash_run.sh
@@ -180,11 +180,11 @@ do
 	BUILDTAG=""
 	LOG="${LOG_DIR}/mash.${TAG}.log"
 	if [[ $TAG = *"infrastructure"* ]]
-    then
+	then
 		FAKETAG=${TAG/release/testing}
 	else
 		FAKETAG=${TAG/testing/candidate}
-		FAKETAG=${TAG/release/candidate}
+		FAKETAG=${FAKETAG/release/candidate}
 	fi
 	BUILDTAG=`grep ${FAKETAG} ${TARGETS} | awk '{print $2}'`
 	[ ! -z "$BUILDTAG" ] && ARCHES=`${KOJI} taginfo ${BUILDTAG} | grep Arches | cut -d ":" -f 2-`
@@ -196,8 +196,8 @@ do
 	then
         	${KOJI} list-tagged $TAG > $MASH_CACHE/$TAG.buildlist
 	else
-        	BUILDLIST=`mktemp`
-        	${KOJI} list-tagged $TAG > $BUILDLIST
+		BUILDLIST=`mktemp`
+		${KOJI} list-tagged $TAG > $BUILDLIST
 		diff $BUILDLIST $MASH_CACHE/$TAG.buildlist &>> $LOG
 		if [ $? -eq 0 ]
 		then
@@ -205,9 +205,9 @@ do
 			[ -f $BUILDLIST ] &&  rm -rf $BUILDLIST
 			continue
 		else
-               		echo " -> updating cache for $TAG" &>> $LOG
+			echo " -> updating cache for $TAG" &>> $LOG
 			cp $BUILDLIST $MASH_CACHE/$TAG.buildlist
-       		fi
+		fi
 		[ -f $BUILDLIST ] &&  rm -rf $BUILDLIST
 	fi
 	mash_run "${TAG}" "${LOG}" &