diff --git a/src/itdelatrisu/opsu/beatmap/BeatmapDifficultyCalculator.java b/src/itdelatrisu/opsu/beatmap/BeatmapDifficultyCalculator.java
index 6cf29528..45075b55 100644
--- a/src/itdelatrisu/opsu/beatmap/BeatmapDifficultyCalculator.java
+++ b/src/itdelatrisu/opsu/beatmap/BeatmapDifficultyCalculator.java
@@ -81,7 +81,7 @@ public class BeatmapDifficultyCalculator {
 	 */
 	public BeatmapDifficultyCalculator(Beatmap beatmap) {
 		this.beatmap = beatmap;
-		if (beatmap.timingPoints == null)
+		if (beatmap.breaks == null)
 			BeatmapDB.load(beatmap, BeatmapDB.LOAD_ARRAY);
 		BeatmapParser.parseHitObjects(beatmap);
 	}
diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java
index 549b3c32..b45c3303 100644
--- a/src/itdelatrisu/opsu/states/Game.java
+++ b/src/itdelatrisu/opsu/states/Game.java
@@ -1532,7 +1532,7 @@ public class Game extends BasicGameState {
 	public void loadBeatmap(Beatmap beatmap) {
 		this.beatmap = beatmap;
 		Display.setTitle(String.format("%s - %s", game.getTitle(), beatmap.toString()));
-		if (beatmap.timingPoints == null)
+		if (beatmap.breaks == null)
 			BeatmapDB.load(beatmap, BeatmapDB.LOAD_ARRAY);
 		BeatmapParser.parseHitObjects(beatmap);
 		HitSound.setDefaultSampleSet(beatmap.sampleSet);