diff --git a/model/SongHandler.java b/model/SongHandler.java
index dcaf687..2afb497 100644
--- a/model/SongHandler.java
+++ b/model/SongHandler.java
@@ -35,7 +35,7 @@ public class SongHandler {
 		
 		currentSong = null;
 		currentSongInstance = null;
-		currentIndex = 1;
+		currentIndex = 0;
 		
 		p = new AudioPlayer();
 		
@@ -46,7 +46,7 @@ public class SongHandler {
 		
 		songs = DirScanner.scanDirectories(dir);
 		
-		Collections.sort(songs, new SortALPHA());
+		sort(new SortALPHA());
 		
 		sql.update(songs);