diff --git a/src/mpd_client.c b/src/mpd_client.c
index 042bae5..732f41b 100644
--- a/src/mpd_client.c
+++ b/src/mpd_client.c
@@ -201,12 +201,13 @@ out_artistalbum:
             } else {
                 searchstr = strdup(token);
             }
-            if((token = strtok(NULL, ",")) == NULL) {
+/*            if((token = strtok(NULL, ",")) == NULL) {
                 goto out_artistalbumtitle;
             } else {
                 p_charbuf2 = strdup(token);
-            }            
-            n = mympd_put_songs_in_album(mpd.buf, searchstr, p_charbuf2);
+            }
+*/            
+            n = mympd_put_songs_in_album(mpd.buf, searchstr, token+strlen(token)+1);
             free(searchstr);
 out_artistalbumtitle:
             free(p_charbuf);