diff --git a/Plugins/CueSheet/CueSheet.m b/Plugins/CueSheet/CueSheet.m
index 0dc369615..444b990d1 100644
--- a/Plugins/CueSheet/CueSheet.m
+++ b/Plugins/CueSheet/CueSheet.m
@@ -76,7 +76,6 @@
 		
 		//FILE "filename.shn" WAVE
 		if ([command isEqualToString:@"FILE"]) {
-			track = nil;
 			trackAdded = NO;
 
 			if (![scanner scanString:@"\"" intoString:nil]) {
@@ -179,27 +178,30 @@
 		else if ([command isEqualToString:@"REM"]) //Additional metadata sometimes stored in comments
 		{
 			NSString *type;
-			NSString **dest = NULL;
 			
-			if (![scanner scanUpToCharactersFromSet:whitespace intoString:&type]) {
-				continue;
-			}
 			if ([type isEqualToString:@"GENRE"])
 			{
-				dest = &genre;
+				if ([scanner scanString:@"\"" intoString:nil]) {
+					if (![scanner scanUpToString:@"\"" intoString:&genre]) {
+						continue;
+					}
+				}
+				else {
+					if ( ![scanner scanUpToCharactersFromSet:whitespace intoString:&genre]) {
+						continue;
+					}
+				}
 			}
 			else if ([type isEqualToString:@"DATE"])
 			{
-				dest = &year;
+				if ( ![scanner scanUpToCharactersFromSet:whitespace intoString:&year]) {
+					continue;
+				}
 			}
 			else
 			{
 				continue;
 			}
-			
-			if ( ![scanner scanUpToCharactersFromSet:whitespace intoString:dest]) {
-				continue;
-			}
 		}
 	}
 
diff --git a/Plugins/CueSheet/CueSheetMetadataReader.m b/Plugins/CueSheet/CueSheetMetadataReader.m
index 232a7b853..f9aa40e3d 100644
--- a/Plugins/CueSheet/CueSheetMetadataReader.m
+++ b/Plugins/CueSheet/CueSheetMetadataReader.m
@@ -38,7 +38,7 @@
 				[track artist], @"artist",
 				[track album], @"album",
 				[track title], @"title",
-				[track track], @"track",
+				[NSNumber numberWithInt:[[track track] intValue]], @"track",
 				[track genre], @"genre",
 				[track year], @"year",
 				nil];