diff --git a/src/com/annimon/everlastingsummer/Parser.java b/src/com/annimon/everlastingsummer/Parser.java
index ace511c..5b50a99 100644
--- a/src/com/annimon/everlastingsummer/Parser.java
+++ b/src/com/annimon/everlastingsummer/Parser.java
@@ -404,7 +404,7 @@ public final class Parser {
         if (match(TokenType.SOUND)) loop = false;
         else if (match(TokenType.SOUNDLOOP)) loop = true;
         
-        final String name = consume(TokenType.WORD).getText();
+        final String name = consumeMusicName();
         final FadeInfo fade = matchFade();
         ViewActivity.getInstance().sound(name, loop, fade);
         return false;
@@ -431,7 +431,7 @@ public final class Parser {
     }
     
     private boolean queueSound() {
-        final String name = consume(TokenType.TEXT).getText();
+        final String name = consumeMusicName();
         ViewActivity.getInstance().addSoundToQueue(name);
         return false;
     }