diff --git a/source/glest_game/ai/ai.cpp b/source/glest_game/ai/ai.cpp
index 1d35d37e..1ba96b7a 100644
--- a/source/glest_game/ai/ai.cpp
+++ b/source/glest_game/ai/ai.cpp
@@ -531,7 +531,7 @@ bool Ai::findAbleUnit(int *unitIndex, CommandClass ability, bool idleOnly){
 	*unitIndex= -1;
 	for(int i=0; i<aiInterface->getMyUnitCount(); ++i){
 		const Unit *unit= aiInterface->getMyUnit(i);
-		if(unit->getType()->hasCommandClass(ability)){
+		if(unit->getType()->isCommandable() && unit->getType()->hasCommandClass(ability)){
 			if(!idleOnly || !unit->anyCommand() || unit->getCurrCommand()->getCommandType()->getClass()==ccStop){
 				units.push_back(i);
 			}
@@ -553,55 +553,57 @@ vector<int> Ai::findUnitsHarvestingResourceType(const ResourceType *rt) {
 	Map *map= aiInterface->getMap();
 	for(int i = 0; i < aiInterface->getMyUnitCount(); ++i) {
 		const Unit *unit= aiInterface->getMyUnit(i);
-		if(unit->getType()->hasCommandClass(ccHarvest)) {
-			if(unit->anyCommand() && unit->getCurrCommand()->getCommandType()->getClass() == ccHarvest) {
-				Command *command= unit->getCurrCommand();
-			    const HarvestCommandType *hct= dynamic_cast<const HarvestCommandType*>(command->getCommandType());
-			    if(hct != NULL) {
-					const Vec2i unitTargetPos = unit->getTargetPos();
-					SurfaceCell *sc= map->getSurfaceCell(Map::toSurfCoords(unitTargetPos));
-					Resource *r= sc->getResource();
-					if (r != NULL && r->getType() == rt) {
-						units.push_back(i);
-					}
-			    }
-			}
-		}
-		else if(unit->getType()->hasCommandClass(ccProduce)) {
-			if(unit->anyCommand() && unit->getCurrCommand()->getCommandType()->getClass() == ccProduce) {
-				Command *command= unit->getCurrCommand();
-			    const ProduceCommandType *pct= dynamic_cast<const ProduceCommandType*>(command->getCommandType());
-			    if(pct != NULL) {
-			    	const UnitType *ut = pct->getProducedUnit();
-			    	if(ut != NULL) {
-						const Resource *r = ut->getCost(rt);
-						if(r != NULL) {
-							if (r != NULL && r->getAmount() < 0) {
-								units.push_back(i);
-							}
+		if(unit->getType()->isCommandable()) {
+			if(unit->getType()->hasCommandClass(ccHarvest)) {
+				if(unit->anyCommand() && unit->getCurrCommand()->getCommandType()->getClass() == ccHarvest) {
+					Command *command= unit->getCurrCommand();
+					const HarvestCommandType *hct= dynamic_cast<const HarvestCommandType*>(command->getCommandType());
+					if(hct != NULL) {
+						const Vec2i unitTargetPos = unit->getTargetPos();
+						SurfaceCell *sc= map->getSurfaceCell(Map::toSurfCoords(unitTargetPos));
+						Resource *r= sc->getResource();
+						if (r != NULL && r->getType() == rt) {
+							units.push_back(i);
 						}
-			    	}
-			    }
+					}
+				}
 			}
-		}
-		else if(unit->getType()->hasCommandClass(ccBuild)) {
-			if(unit->anyCommand() && unit->getCurrCommand()->getCommandType()->getClass() == ccBuild) {
-				Command *command= unit->getCurrCommand();
-			    const BuildCommandType *bct= dynamic_cast<const BuildCommandType*>(command->getCommandType());
-			    if(bct != NULL) {
-			    	for(int j = 0; j < bct->getBuildingCount(); ++j) {
-						const UnitType *ut = bct->getBuilding(j);
+			else if(unit->getType()->hasCommandClass(ccProduce)) {
+				if(unit->anyCommand() && unit->getCurrCommand()->getCommandType()->getClass() == ccProduce) {
+					Command *command= unit->getCurrCommand();
+					const ProduceCommandType *pct= dynamic_cast<const ProduceCommandType*>(command->getCommandType());
+					if(pct != NULL) {
+						const UnitType *ut = pct->getProducedUnit();
 						if(ut != NULL) {
 							const Resource *r = ut->getCost(rt);
 							if(r != NULL) {
 								if (r != NULL && r->getAmount() < 0) {
 									units.push_back(i);
-									break;
 								}
 							}
 						}
-			    	}
-			    }
+					}
+				}
+			}
+			else if(unit->getType()->hasCommandClass(ccBuild)) {
+				if(unit->anyCommand() && unit->getCurrCommand()->getCommandType()->getClass() == ccBuild) {
+					Command *command= unit->getCurrCommand();
+					const BuildCommandType *bct= dynamic_cast<const BuildCommandType*>(command->getCommandType());
+					if(bct != NULL) {
+						for(int j = 0; j < bct->getBuildingCount(); ++j) {
+							const UnitType *ut = bct->getBuilding(j);
+							if(ut != NULL) {
+								const Resource *r = ut->getCost(rt);
+								if(r != NULL) {
+									if (r != NULL && r->getAmount() < 0) {
+										units.push_back(i);
+										break;
+									}
+								}
+							}
+						}
+					}
+				}
 			}
 		}
 	}
@@ -614,7 +616,7 @@ vector<int> Ai::findUnitsDoingCommand(CommandClass currentCommand) {
 
 	for(int i = 0; i < aiInterface->getMyUnitCount(); ++i) {
 		const Unit *unit= aiInterface->getMyUnit(i);
-		if(unit->getType()->hasCommandClass(currentCommand)) {
+		if(unit->getType()->isCommandable() && unit->getType()->hasCommandClass(currentCommand)) {
 			if(unit->anyCommand() && unit->getCurrCommand()->getCommandType()->getClass() == currentCommand) {
 				units.push_back(i);
 			}
@@ -630,7 +632,7 @@ bool Ai::findAbleUnit(int *unitIndex, CommandClass ability, CommandClass current
 	*unitIndex= -1;
 	for(int i=0; i<aiInterface->getMyUnitCount(); ++i){
 		const Unit *unit= aiInterface->getMyUnit(i);
-		if(unit->getType()->hasCommandClass(ability)){
+		if(unit->getType()->isCommandable() && unit->getType()->hasCommandClass(ability)){
 			if(unit->anyCommand() && unit->getCurrCommand()->getCommandType()->getClass()==currentCommand){
 				units.push_back(i);
 			}
diff --git a/source/glest_game/gui/selection.cpp b/source/glest_game/gui/selection.cpp
index 8e20633b..57a0129e 100644
--- a/source/glest_game/gui/selection.cpp
+++ b/source/glest_game/gui/selection.cpp
@@ -71,6 +71,11 @@ bool Selection::select(Unit *unit) {
 			return false;
 		}
 
+		//check if commandable
+		if(unit->getType()->isCommandable() == false && isEmpty() == false) {
+			return false;
+		}
+
 		//check if multisel
 		if(unit->getType()->getMultiSelect() == false && isEmpty() == false) {
 			return false;
@@ -181,7 +186,8 @@ bool Selection::isCommandable() const {
 	return
 		isEmpty() == false &&
 		isEnemy() == false &&
-		(selectedUnits.size() == 1 && selectedUnits.front()->isAlive() == false) == false;
+		(selectedUnits.size() == 1 && selectedUnits.front()->isAlive() == false) == false &&
+		selectedUnits.front()->getType()->isCommandable();
 }
 
 bool Selection::isCancelable() const {
diff --git a/source/glest_game/types/unit_type.cpp b/source/glest_game/types/unit_type.cpp
index 39129206..7fbdccf8 100644
--- a/source/glest_game/types/unit_type.cpp
+++ b/source/glest_game/types/unit_type.cpp
@@ -89,6 +89,7 @@ UnitType::UnitType() : ProducibleType() {
     lightColor= Vec3f(0.f);
     light= false;
     multiSelect= false;
+    commandable= true;
 	armorType= NULL;
 	rotatedBuildPos=0;
 
@@ -333,6 +334,10 @@ void UnitType::loaddd(int id,const string &dir, const TechTree *techTree,
 		//multi selection
 		multiSelect= parametersNode->getChild("multi-selection")->getAttribute("value")->getBoolValue();
 
+		//commandable
+		if(parametersNode->hasChild("commandable")){
+			commandable= parametersNode->getChild("commandable")->getAttribute("value")->getBoolValue();
+		}
 		//cellmap
 		allowEmptyCellMap = false;
 		const XmlNode *cellMapNode= parametersNode->getChild("cellmap");
@@ -1240,6 +1245,7 @@ std::string UnitType::toString() const {
 	result += " light = " + intToStr(light);
 	result += " lightColor = " + lightColor.getString();
 	result += " multiSelect = " + intToStr(multiSelect);
+	result += " commandable = " + intToStr(commandable);
 	result += " sight = " + intToStr(sight);
 	result += " size = " + intToStr(size);
 	result += " height = " + intToStr(height);
diff --git a/source/glest_game/types/unit_type.h b/source/glest_game/types/unit_type.h
index 1738406d..fee7f903 100644
--- a/source/glest_game/types/unit_type.h
+++ b/source/glest_game/types/unit_type.h
@@ -171,6 +171,7 @@ private:
 	bool light;
     Vec3f lightColor;
     bool multiSelect;
+    bool commandable;
     int sight;
     int size;							//size in cells
     int renderSize;						//size to render in cells
@@ -255,6 +256,7 @@ public:
 	inline bool getRotationAllowed() const						{return rotationAllowed;}
 	inline Vec3f getLightColor() const							{return lightColor;}
 	inline bool getMultiSelect() const							{return multiSelect;}
+	inline bool isCommandable() const							{return commandable;}
 	inline int getSight() const								{return sight;}
 	inline int getSize() const									{return size;}
 	inline int getRenderSize() const								{return renderSize;}