diff --git a/apps/database.c b/apps/database.c
index 0e2a53b317..1691e2221b 100644
--- a/apps/database.c
+++ b/apps/database.c
@@ -314,8 +314,8 @@ void rundb_unbuffer_track(struct mp3entry *id, bool last_track) {
     }
 }
 
-void rundb_track_change(struct track_info *ti) {
-    ti->id3.playcount++;
+void rundb_track_change(struct mp3entry *id) {
+    id->playcount++;
 }
 
 void rundb_buffer_track(struct mp3entry *id, bool last_track) {
diff --git a/apps/playback.c b/apps/playback.c
index fb8232012e..e12b01ee55 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -159,7 +159,7 @@ extern struct codec_api ci;
 static int new_track;
 
 /* Callback function to call when current track has really changed. */
-void (*track_changed_callback)(struct track_info *ti);
+void (*track_changed_callback)(struct mp3entry *id3);
 void (*track_buffer_callback)(struct mp3entry *id3, bool last_track);
 void (*track_unbuffer_callback)(struct mp3entry *id3, bool last_track);
 
@@ -520,7 +520,7 @@ void audio_set_track_unbuffer_event(void (*handler)(struct mp3entry *id3,
     track_unbuffer_callback = handler;
 }
 
-void audio_set_track_changed_event(void (*handler)(struct track_info *ti))
+void audio_set_track_changed_event(void (*handler)(struct mp3entry *id3))
 {
     track_changed_callback = handler;
 }
@@ -1476,7 +1476,7 @@ void audio_thread(void)
                 
             case AUDIO_TRACK_CHANGED:
                 if (track_changed_callback)
-                    track_changed_callback(cur_ti);
+                    track_changed_callback(&cur_ti->id3);
                 playlist_update_resume_info(audio_current_track());
                 break ;
                 
diff --git a/apps/playback.h b/apps/playback.h
index 946ac36d92..7ed9a4b700 100644
--- a/apps/playback.h
+++ b/apps/playback.h
@@ -66,7 +66,7 @@ struct track_info {
 };
 
 /* Functions */
-void audio_set_track_changed_event(void (*handler)(struct track_info *ti));
+void audio_set_track_changed_event(void (*handler)(struct mp3entry *id3));
 void audio_set_track_buffer_event(void (*handler)(struct mp3entry *id3,
                                                   bool last_track));
 void audio_set_track_unbuffer_event(void (*handler)(struct mp3entry *id3,