diff --git a/Application/PlaybackController.m b/Application/PlaybackController.m
index a10d4a815..23c15077f 100644
--- a/Application/PlaybackController.m
+++ b/Application/PlaybackController.m
@@ -761,7 +761,7 @@ NSDictionary *makeRGInfo(PlaylistEntry *pe) {
 }
 
 - (void)audioPlayer:(AudioPlayer *)player pushInfo:(NSDictionary *)info toTrack:(id)userInfo {
-	PlaylistEntry *pe = [playlistController currentEntry];
+	PlaylistEntry *pe = (PlaylistEntry *)userInfo;
 	[pe setMetadata:info];
 	[playlistView refreshCurrentTrack:self];
 	[self sendMetaData];
diff --git a/Audio/AudioPlayer.h b/Audio/AudioPlayer.h
index 2cbfb08ca..609aca9f8 100644
--- a/Audio/AudioPlayer.h
+++ b/Audio/AudioPlayer.h
@@ -78,7 +78,7 @@
 
 - (void)restartPlaybackAtCurrentPosition;
 
-- (void)pushInfo:(NSDictionary *)info;
+- (void)pushInfo:(NSDictionary *)info toTrack:(id)userInfo;
 
 + (NSArray *)fileTypes;
 + (NSArray *)schemes;
diff --git a/Audio/AudioPlayer.m b/Audio/AudioPlayer.m
index 66dbced7b..77738de42 100644
--- a/Audio/AudioPlayer.m
+++ b/Audio/AudioPlayer.m
@@ -224,8 +224,8 @@
 	[self sendDelegateMethod:@selector(audioPlayer:restartPlaybackAtCurrentPosition:) withObject:[bufferChain userInfo] waitUntilDone:NO];
 }
 
-- (void)pushInfo:(NSDictionary *)info {
-	[self sendDelegateMethod:@selector(audioPlayer:pushInfo:toTrack:) withObject:info withObject:[bufferChain userInfo] waitUntilDone:NO];
+- (void)pushInfo:(NSDictionary *)info toTrack:(id)userInfo {
+	[self sendDelegateMethod:@selector(audioPlayer:pushInfo:toTrack:) withObject:info withObject:userInfo waitUntilDone:NO];
 }
 
 - (void)setShouldContinue:(BOOL)s {
diff --git a/Audio/Chain/BufferChain.m b/Audio/Chain/BufferChain.m
index 74fe6eb4e..1362d9ad5 100644
--- a/Audio/Chain/BufferChain.m
+++ b/Audio/Chain/BufferChain.m
@@ -262,7 +262,7 @@
 }
 
 - (void)pushInfo:(NSDictionary *)info {
-	[controller pushInfo:info];
+	[controller pushInfo:info toTrack:userInfo];
 }
 
 - (void)setError:(BOOL)status {