diff --git a/src/itdelatrisu/opsu/GameData.java b/src/itdelatrisu/opsu/GameData.java
index dda87642..56c8566f 100644
--- a/src/itdelatrisu/opsu/GameData.java
+++ b/src/itdelatrisu/opsu/GameData.java
@@ -1037,9 +1037,9 @@ public class GameData {
 	 * or {@code Grade.NULL} if no objects have been processed.
 	 */
 	private Grade getGrade() {
-		boolean silver = scoreData==null?
-				(GameMod.HIDDEN.isActive() || GameMod.FLASHLIGHT.isActive()):
-				(scoreData.mods&(GameMod.HIDDEN.getBit()|GameMod.FLASHLIGHT.getBit()))!=0;
+		boolean silver = (scoreData == null) ?
+				(GameMod.HIDDEN.isActive() || GameMod.FLASHLIGHT.isActive()) :
+				(scoreData.mods & (GameMod.HIDDEN.getBit() | GameMod.FLASHLIGHT.getBit())) != 0;
 		return getGrade(
 			hitResultCount[HIT_300], hitResultCount[HIT_100],
 			hitResultCount[HIT_50], hitResultCount[HIT_MISS],
diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java
index b0c830d6..73a88901 100644
--- a/src/itdelatrisu/opsu/states/Game.java
+++ b/src/itdelatrisu/opsu/states/Game.java
@@ -1103,6 +1103,13 @@ public class Game extends BasicGameState {
 
 		// restart the game
 		if (restart != Restart.FALSE) {
+			// load mods
+			if (isReplay) {
+				previousMods = GameMod.getModState();
+				GameMod.loadModState(replay.mods);
+			}
+
+			// check restart state
 			if (restart == Restart.NEW) {
 				// new game
 				loadImages();
@@ -1187,10 +1194,6 @@ public class Game extends BasicGameState {
 
 			// load replay frames
 			if (isReplay) {
-				// load mods
-				previousMods = GameMod.getModState();
-				GameMod.loadModState(replay.mods);
-
 				// load initial data
 				replayX = container.getWidth() / 2;
 				replayY = container.getHeight() / 2;