diff --git a/src/core/ct/gstreamer.py b/src/core/ct/gstreamer.py
index 9021c971..13fe326a 100644
--- a/src/core/ct/gstreamer.py
+++ b/src/core/ct/gstreamer.py
@@ -46,8 +46,10 @@ def load(path):
 
 def play():
 	global pipeline
-	if not pipeline == None:
-		pipeline.set_state(gst.STATE_PLAYING)
+	#if not pipeline == None:
+	pipeline.set_state(gst.STATE_PLAYING)
+	#else:
+	#	manager.run("next",settings.get("cursong"))
 
 
 def pause():
@@ -138,6 +140,11 @@ def init():
 			join = ' '
 			path = join.join(input)
 			load(path)
+		else:
+			if settings.has("curtrk")==True:
+				track = settings.get("curtrk")
+				if track > 0:
+					manager.run("next",[track,False])
 	if settings.has("volume") == False:
 		settings.set("volume",1.0)
 	setvol(settings.get("volume"))
diff --git a/src/core/music.py b/src/core/music.py
index 0f88ad73..d4b3f05d 100644
--- a/src/core/music.py
+++ b/src/core/music.py
@@ -38,9 +38,7 @@ class Plugin(plugin.Plugin):
 		whrstr += " AND libtrack.track=track.id AND libtrack.library="+curlib
 		sel = sql.Select(selstr, frmstr, whrstr)
 		result = sel.execute().fetchall()
-	
-		#if len(result) <= id:
-		#	return
+
 		result = result[id]
 
 		write(result[0])
diff --git a/src/core/next.py b/src/core/next.py
index a702df7f..404cad32 100644
--- a/src/core/next.py
+++ b/src/core/next.py
@@ -54,6 +54,9 @@ class Plugin(plugin.Plugin):
 			return
 
 		nxttrk = int(args[0])
+		play = True
+		if len(args)>1 and bool(args[1])==False:
+			play = False
 
 		curlib = str( settings.get("curlib") )
 		sel = sql.Select("track","libtrack","library="+curlib)
@@ -66,6 +69,8 @@ class Plugin(plugin.Plugin):
 
 		settings.set("curtrk",nxttrk)
 		manager.run("music",["load",path])
-		manager.run("music",["play"])
+		if play==True:
+			manager.run("music",["play"])
+		manager.run("music",["now"])