diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 7a944fe..2028656 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -1316,8 +1316,16 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
 
         case SYNC_TICKET:
         {
-            ShopOperationSingleTemplate(manager, operationMessage, SHOP_OPERATION_CONNECT, "Shop Connect",
-                    "Shop Connect Finished.\n", "Shop Connect Failed. Retrying...", DOWNLOAD_TWL);
+            if(s_GetIvsOnlyMode)
+            {
+                ShopOperationSingleTemplate(manager, operationMessage, SHOP_OPERATION_CONNECT, "Shop Connect",
+                        "Shop Connect Finished.\n", "Shop Connect Failed. Retrying...", WAIT_SD_EJECT);
+            }
+            else
+            {
+                ShopOperationSingleTemplate(manager, operationMessage, SHOP_OPERATION_CONNECT, "Shop Connect",
+                        "Shop Connect Finished.\n", "Shop Connect Failed. Retrying...", DOWNLOAD_TWL);
+            }
         }
         break;
 
@@ -1489,8 +1497,12 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
 
         case DOWNLOAD_IVS_WAIT_NEXT:
         {
-            s_RestoreState = WAIT_SD_EJECT;
-            DeleteAllCheckFiles();
+            operationMessage.push_back(::std::string("Press A or START Button to Continue."));
+            if(nextStep)
+            {
+                s_RestoreState = SYNC_TICKET;
+                DeleteAllCheckFiles();
+            }
         }
         break;