diff --git a/android/assets/text/application/application_cs.properties b/android/assets/text/application/application_cs.properties
index 39c4b78361afe96da79425f399416b2dec14981d..0071bcb1113510e538dfc7d3fea0a8be72594cce 100644
--- a/android/assets/text/application/application_cs.properties
+++ b/android/assets/text/application/application_cs.properties
@@ -64,7 +64,7 @@ game_robbery_title=LupiÄŤi
 game_robbery_description=Procvičování pracovní paměti
 game_robbery_preloader=Na začátku hry si přečti pravidlo, podle kterého poznáš lupiče. Zapamatuj si\u00A0ho.\nSleduj lidi vcházející do místnosti a\u00A0dotykem lupiče označ.
 game_kidnapping_title=Ăšnos
-game_kidnapping_description=Procvičování sluchové paměti
+game_kidnapping_description=Procvičování sluchového rozlišování
 game_kidnapping_preloader1=Poslechni a\u00A0zapamatuj si zvuk, který jsi slyšel na křižovatce.
 game_kidnapping_preloader2=Pak si poslechni zvuky okolnĂ­ch ulic a\u00A0urÄŤi, kterou jste projeli.
 game_kidnapping_preloader3=Se sluchátky zvuky lépe uslyšíš.
diff --git a/android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java b/android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java
index 138f5b6c7b317f93de3a796894506503fe77637d..db84cebc95ec5f11c52b2d5eb44069aa58b1c20e 100644
--- a/android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java
+++ b/android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java
@@ -37,14 +37,12 @@ public class AndroidLauncher extends AndroidApplication {
 		config.useWakelock = true;
 		config.numSamples = MULTI_SAMPLING_2X;
 
-		if (savedInstanceState == null && tablexia == null) {
-			initialize(tablexia = new Tablexia(BuildConfig.BUILD_TYPE,
-					getResources().getConfiguration().locale,
-					SQL_CONNECTION_TYPE,
-					new AndroidConnectionManager(getContext()),
-                    HAS_SOFT_BACK_BUTTON,
-					savedInstanceState == null), config);
-		}
+        initialize(tablexia = new Tablexia(BuildConfig.BUILD_TYPE,
+                getResources().getConfiguration().locale,
+                SQL_CONNECTION_TYPE,
+                new AndroidConnectionManager(getContext()),
+                HAS_SOFT_BACK_BUTTON,
+                savedInstanceState == null), config);
 
         if (TablexiaSettings.getInstance().getBuildType().isBugReport() && TablexiaBuildConfig.FLURRY_KEY != null) {
             FlurryAgent.setLogEnabled(false);
diff --git a/core/external b/core/external
index be0e154e307cc5d7210db0897da5b508ab8aa2eb..d8cb4a89e64ceec83718fc478f76a5eb31d8fb3e 160000
--- a/core/external
+++ b/core/external
@@ -1 +1 @@
-Subproject commit be0e154e307cc5d7210db0897da5b508ab8aa2eb
+Subproject commit d8cb4a89e64ceec83718fc478f76a5eb31d8fb3e
diff --git a/core/src/cz/nic/tablexia/model/game/GameDAO.java b/core/src/cz/nic/tablexia/model/game/GameDAO.java
index 3f4ca57b15e8f1f2a3a51a8e1983128802a253e9..43bd4f7b46a5c11e7b5b4bfbef4b12886538af4d 100644
--- a/core/src/cz/nic/tablexia/model/game/GameDAO.java
+++ b/core/src/cz/nic/tablexia/model/game/GameDAO.java
@@ -157,7 +157,11 @@ public class GameDAO {
     public static final String GAME_SELECT_FOR_USER_AND_DEFINITION = "SELECT id, user_id, difficulty_number, game_number, random_seed, start_time, end_time FROM game WHERE user_id = ? AND game_number = ? AND end_time IS NOT NULL AND end_time != 0 ORDER BY start_time ASC";
     public static final String GAME_SELECT_COUNT_FOR_GAME = "SELECT count(id) FROM game WHERE game_number = ? AND user_id = ?";
     public static final String GAME_SELECT_ALL_FOR_USER_SYNC = "SELECT id, user_id, difficulty_number, game_number, random_seed, start_time, end_time FROM game where user_id = ? AND sync_at is null";
+
     public static final String GAME_SELECT_BY_START_AND_END = "SELECT id FROM game WHERE user_id = ? AND start_time = ? AND end_time = ?";
+    public static final String GAME_SELECT_BY_START_AND_NULL_END = "SELECT id FROM game WHERE user_id = ? AND start_time = ? AND end_time IS NULL";
+
+
     public static final String GAME_SELECT_LAST_SCORES_FOR_USER_AND_GAME = "SELECT value FROM game_score INNER JOIN game ON game_score.game_id=game.id AND game.user_id=? AND game.game_number=? WHERE game_score.key=? AND end_time IS NOT NULL ORDER BY game_id DESC LIMIT 1";
     public static final String GAME_SELECT_FOR_RANK_MANAGER = "SELECT id, difficulty_number, game_number, start_time, end_time FROM game WHERE user_id = ? AND end_time IS NOT NULL AND end_time != 0 ORDER BY end_time ASC";
 
@@ -222,10 +226,17 @@ public class GameDAO {
     }
 
     public static Long selectGameByTimes(long userId, long startTime, long endTime) throws SQLException {
-        PreparedStatement statement = TablexiaStorage.getInstance().prepareStatement(GAME_SELECT_BY_START_AND_END);
+        // workaround for sync error -> serialized JSON from server contains 0 instead of NULL
+//        PreparedStatement statement = TablexiaStorage.getInstance().prepareStatement(GAME_SELECT_BY_START_AND_END);
+        PreparedStatement statement = TablexiaStorage.getInstance().prepareStatement(endTime != 0 ? GAME_SELECT_BY_START_AND_END : GAME_SELECT_BY_START_AND_NULL_END);
         statement.setLong(1, userId);
         statement.setLong(2, startTime);
-        statement.setLong(3, endTime);
+
+        // workaround for sync error -> serialized JSON from server contains 0 instead of NULL
+//        statement.setLong(3, endTime);
+        if (endTime != 0) {
+            statement.setLong(3, endTime);
+        }
 
         Long gameId = null;
         ResultSet resultSet = statement.executeQuery();
diff --git a/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java b/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
index 346f7698853dbf1c8009c78f005221b489e2f466..0e84efd9fe24e1338cad5721e33c82e8efb97fcd 100644
--- a/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
+++ b/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
@@ -424,7 +424,7 @@ public class GameMenuPage extends MenuPage {
             }
         });
 		gameDifficulty = UserDifficultySettingsDAO.getUserSettingsByGame(TablexiaSettings.getInstance().getSelectedUser().getId(), game.getGameNumber());
-        dragSwitchListener.switchToStep(gameDifficulty.getDifficultyNumber() - 1, false);
+        dragSwitchListener.switchToStep(gameDifficulty.getDifficultyNumber() - 1);
 
         stepSoundsEnabled = true;
     }