diff --git a/Assets/Scripts/Dialogue/GameOverUI.cs b/Assets/Scripts/Dialogue/GameOverUI.cs
index 16a75c74eecb0e3498fd339cdf812883e0d70d0e..d8d71bbda8a8eef56becf69d510ea088385e1e85 100644
--- a/Assets/Scripts/Dialogue/GameOverUI.cs
+++ b/Assets/Scripts/Dialogue/GameOverUI.cs
@@ -26,7 +26,7 @@ public class GameOverUI : MonoBehaviour
 		if(isEnabled)
 		{
 			Debug.Log("Go to opening");
-			SceneManager.LoadScene("Opening");
+			SceneManager.LoadScene(SceneManager.GetActiveScene().name);
 		}
 	}
 }
diff --git a/Assets/Scripts/Highscore/HighscoreTable.cs b/Assets/Scripts/Highscore/HighscoreTable.cs
index ede4cbb55e87477ab0d8f2d289756d1003cf103b..35bec7fc942859bb9f9d29abba7f383bf7f7ea29 100644
--- a/Assets/Scripts/Highscore/HighscoreTable.cs
+++ b/Assets/Scripts/Highscore/HighscoreTable.cs
@@ -1,8 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.UI;
-
+using UnityEngine.UI;
 public class HighscoreTable : MonoBehaviour
 {
     private Transform entryContainer;
@@ -22,9 +21,9 @@ public class HighscoreTable : MonoBehaviour
     {
         MainManager mainManager = GameObject.Find("MainManager").GetComponent<MainManager>();
         if(mainManager.time > 0)
-        {
-            int secs = mainManager.time % 60;
-            int mins = mainManager.time / 60;
+        {
+			int secs = (mainManager.time % 60_000)/1000;
+            int mins = mainManager.time / 60_000;
             AddHighscoreEntry(mins, secs, PlayerPrefs.GetString("playerName"));
         }
         UpdateUI();