diff --git a/gamestate.cpp b/gamestate.cpp
index 65886cd..53efc18 100644
--- a/gamestate.cpp
+++ b/gamestate.cpp
@@ -290,7 +290,7 @@ bool GameState::autoMoveColumnCard(int columnId, int cardIndex)
     // This is a multiple cards move
     qDebug() << "Attempting auto-move of column " << columnId << " card range " << cardIndex << " to " << columnStack.size() - 1;
     QList<PlayingCard*> selectedCards;
-    for (int i = cardIndex; i < m_columns.size(); ++i) {
+    for (int i = cardIndex; i < columnStack.size(); ++i) {
         ColumnSlot* col = columnStack[i];
         selectedCards.append(col->card());
     }
@@ -307,6 +307,8 @@ bool GameState::autoMoveColumnCard(int columnId, int cardIndex)
         curSlot->deleteLater();
     }
 
+    ensureColumnRevealed(columnId);
+
     emit columnsChanged();
     return true;
 }