diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
index 617c691..68b1134 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
@@ -121,8 +121,9 @@ namespace Banshee.Dap.MassStorage
             video_folders = MergeValues ("video_folders", config, DefaultVideoFolders);
             playback_mime_types = MergeValues ("output_formats", config, DefaultPlaybackMimeTypes);
             playlist_formats = MergeValues ("playlist_formats", config, DefaultPlaylistFormats);
-            playlist_paths = new string [] { GetPreferredValue ("playlist_path", config, DefaultPlaylistPath) };
+            playlist_path = GetPreferredValue ("playlist_path", config, DefaultPlaylistPath);
             folder_depth = GetPreferredValue ("folder_depth", config, DefaultFolderDepth);
+            Console.WriteLine ("_________playlist_path preferred value is " + (playlist_path ?? "<null>"));
 
             string preferred_folder_separator = GetPreferredValue ("folder_separator", config, DefaultFolderSeparator);
             if (preferred_folder_separator == Folder.DosSeparator.ToString () || preferred_folder_separator == "DOS") {
@@ -266,9 +267,9 @@ namespace Banshee.Dap.MassStorage
             get { return null; }
         }
 
-        private string [] playlist_paths;
+        private string playlist_path;
         public virtual string [] PlaylistPaths {
-            get { return playlist_paths; }
+            get { return playlist_path != null ? new string[] { playlist_path } : new string [0]; }
         }
 
         protected virtual string[] DefaultPlaybackMimeTypes {
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
index 79c1e3e..5fd3e50 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
@@ -246,6 +246,8 @@ namespace Banshee.Dap.MassStorage
                         || MediaCapabilities.PlaylistPaths.Length == 0) {
                         playlists_paths = new string [] { WritePath };
                     } else {
+                        Console.WriteLine ("___MediaCapabilities type is {0} and has {1} playlistpaths",
+                                           MediaCapabilities.GetType ().FullName, MediaCapabilities.PlaylistPaths.Length);
                         playlists_paths = new string [MediaCapabilities.PlaylistPaths.Length];
                         for (int i = 0; i < MediaCapabilities.PlaylistPaths.Length; i++) {
                             playlists_paths[i] = Paths.Combine (BaseDirectory, MediaCapabilities.PlaylistPaths[i]);
