diff --git a/source/states/AchievementsState.hx b/source/states/AchievementsState.hx
index db2b5e9..0e1b7f5 100644
--- a/source/states/AchievementsState.hx
+++ b/source/states/AchievementsState.hx
@@ -82,8 +82,8 @@ class AchievementsState extends ExtendableState {
 				openSubState(new PromptSubState('This action will reset ALL of the achievements.\nProceed anyways?', () -> {
 					FlxG.sound.play(Paths.sound('select'));
 					for (i in 0...achievementArray.length) {
-						achievementArray[i].forget();
-						achievementGrp.members[i].text = '???';
+						Achievements.forget(i);
+						ExtendableState.resetState();
 					}
 				}, function() {
 					FlxG.sound.play(Paths.sound('cancel'));
@@ -91,8 +91,8 @@ class AchievementsState extends ExtendableState {
 			} else {
 				openSubState(new PromptSubState('This action will reset the selected achievement.\nProceed anyways?', () -> {
 					FlxG.sound.play(Paths.sound('select'));
-					achievementArray[curSelected].forget();
-					achievementGrp.members[curSelected].text = '???';
+					Achievements.forget(achievementArray[curSelected]);
+					ExtendableState.resetState();
 				}, function() {
 					FlxG.sound.play(Paths.sound('cancel'));
 				}));
diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
index 78ddf82..3ecab3d 100644
--- a/source/states/PlayState.hx
+++ b/source/states/PlayState.hx
@@ -707,7 +707,7 @@ class PlayState extends ExtendableState {
 		}
 	}
 
-	function checkForAchievement(ach:Array<String> = null):String {
+	function checkForAchievement(achs:Array<String> = null):String {
 		if (chartingMode || SaveData.settings.botPlay)
 			return null;
 
@@ -765,8 +765,9 @@ class PlayState extends ExtendableState {
 					return achievementName;
 				}
 			}
-			return null;
 		}
+
+		return null;
 	}
 
 	function generateSong() {