diff --git a/cockatrice/src/selectzone.cpp b/cockatrice/src/selectzone.cpp
index 30156df6..8b86cd88 100644
--- a/cockatrice/src/selectzone.cpp
+++ b/cockatrice/src/selectzone.cpp
@@ -22,8 +22,12 @@ void SelectZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 			pos.setY(br.height());
 		
 		QRectF selectionRect = QRectF(selectionOrigin, pos).normalized();
-		for (int i = 0; i < cards.size(); ++i)
+		for (int i = 0; i < cards.size(); ++i) {
+			if (cards[i]->getAttachedTo())
+				if (cards[i]->getAttachedTo()->getZone() != this)
+					continue;
 			cards[i]->setSelected(selectionRect.intersects(cards[i]->mapRectToParent(cards[i]->boundingRect())));
+		}
 		
 		static_cast<GameScene *>(scene())->resizeRubberBand(scenePos() + pos);
 		event->accept();
diff --git a/common/server_protocolhandler.cpp b/common/server_protocolhandler.cpp
index e7a430bc..167bab6f 100644
--- a/common/server_protocolhandler.cpp
+++ b/common/server_protocolhandler.cpp
@@ -761,7 +761,7 @@ ResponseCode Server_ProtocolHandler::cmdAttachCard(Command_AttachCard *cmd, Comm
 		// Make a copy of the list because its contents change during the loop otherwise.
 		QList<Server_Card *> attachedList = card->getAttachedCards();
 		for (int i = 0; i < attachedList.size(); ++i)
-			player->unattachCard(cont, attachedList[i]);
+			attachedList[i]->getZone()->getPlayer()->unattachCard(cont, attachedList[i]);
 		
 		if (targetzone->isColumnStacked(targetCard->getX(), targetCard->getY())) {
 			CardToMove *cardToMove = new CardToMove(targetCard->getId());