diff --git a/Medialib.cpp b/Medialib.cpp
index 125279a..cf75217 100644
--- a/Medialib.cpp
+++ b/Medialib.cpp
@@ -148,7 +148,6 @@ MedialibList::mimeData(const QList<QListWidgetItem*> items) const
 	MedialibListItem *it = dynamic_cast<MedialibListItem *> (currentItem ());
 	
 	QDataStream stream(&encodedData, QIODevice::WriteOnly);
-	qDebug ("%s %s", qPrintable (it->getArtist ()), qPrintable (it->getAlbum ()));
 	stream << it->getArtist ();
 	stream << it->getAlbum ();
 
diff --git a/XMMSHandler.cpp b/XMMSHandler.cpp
index d2e3cc4..058a15c 100644
--- a/XMMSHandler.cpp
+++ b/XMMSHandler.cpp
@@ -84,8 +84,6 @@ XMMSHandler::medialib_entry_changed (XMMSResultValue<uint> *res)
 	uint i;
 	res->getValue (&i);
 
-	m_currentid = i;
-
 	if (i > 0) {
 		XMMSResultDict *r = m_xmmsc->medialib_get_info (i);
 		r->connect (sigc::mem_fun (this, &XMMSHandler::medialib_info));
@@ -179,6 +177,8 @@ XMMSHandler::playback_current_id (XMMSResultValue<uint> *res)
 
 	m_currentid = i;
 
+	qDebug ("currentid = %d", m_currentid);
+
 	if (i > 0) {
 		XMMSResultDict *r = m_xmmsc->medialib_get_info (i);
 		r->connect (sigc::mem_fun (this, &XMMSHandler::medialib_info));