diff --git a/source/Character.hx b/source/Character.hx
index 4177e2b52..e13abdee9 100644
--- a/source/Character.hx
+++ b/source/Character.hx
@@ -622,8 +622,8 @@ class Character extends FlxSprite
 	{
 		animation.play(AnimName, Force, Reversed, Frame);
 
-		var daOffset = animOffsets.get(animation.curAnim.name);
-		if (animOffsets.exists(animation.curAnim.name))
+		var daOffset = animOffsets.get(AnimName);
+		if (animOffsets.exists(AnimName))
 		{
 			offset.set(daOffset[0], daOffset[1]);
 		}
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 647357157..663127143 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -124,6 +124,10 @@ class PlayState extends MusicBeatState
 
 	override public function create()
 	{
+
+		if (FlxG.sound.music != null)
+			FlxG.sound.music.stop();
+
 		// var gameCam:FlxCamera = FlxG.camera;
 		camGame = new FlxCamera();
 		camHUD = new FlxCamera();