diff --git a/src/cmddroid.cpp b/src/cmddroid.cpp
index efa74f64230..38aede389bd 100644
--- a/src/cmddroid.cpp
+++ b/src/cmddroid.cpp
@@ -220,19 +220,16 @@ unsigned int cmdGetCommanderLevel(const DROID* psDroid)
 }
 
 // Selects all droids for a given commander
-void	cmdSelectSubDroids(DROID *psDroid)
+void cmdSelectSubDroids(DROID *psDroid)
 {
-DROID	*psCurr;
+	DROID *psCurr;
 
 	for (psCurr = apsDroidLists[selectedPlayer]; psCurr; psCurr = psCurr->psNext)
 	{
-		if( hasCommander(psCurr) )
+		if (hasCommander(psCurr)
+		 && psCurr->psGroup->psCommander == psDroid)
 		{
-			if(psCurr->psGroup->psCommander == psDroid)
-			{
-//				psCurr->selected = true;
-				SelectDroid(psCurr);
-			}
+			SelectDroid(psCurr);
 		}
 	}
 }