diff --git a/SongList.java b/SongList.java
index 02e6d02..c984498 100644
--- a/SongList.java
+++ b/SongList.java
@@ -91,7 +91,7 @@ public class SongList {
                 new_list.add(artist, current.getTitle());
             return new_list;
         }
-        while (current.getLink() != m_last) {
+        for (int i = 0; i < size(); i++) {
             if (current.getArtist().compareTo(artist) == 0)
                 new_list.add(artist, current.getTitle());
             current = current.getLink();