--- a/slideshow_creator.inc	2013-02-26 17:13:33.000000000 +1000
+++ b/slideshow_creator.inc	2013-06-25 16:18:16.000000000 +1000
@@ -16,8 +16,6 @@
  *  Array. All images' paths
  */
 function _slideshow_creator_explore_dir($path = '', $recursive = FALSE) {
-  // The path should be
-  $path = variable_get('file_directory_path', conf_path() . '/files') . $path;
 
   // A list of image extensions. It should be on lower and
   // upper cases to work on non GNU systems, like Solaris and Windows
@@ -44,9 +42,9 @@
 
   // If its a recursive scan, enter in all directories
   // and scan for more image files
-  if ($dirs = glob("$path*", GLOB_ONLYDIR) and !empty($recursive)) {
+  if ($dirs = glob("$path*", GLOB_ONLYDIR) and $recursive) {
     foreach ($dirs as $dir) {
-      $files = array_merge($files, _slideshow_creator_explore_dir("$dir/"));
+      $files = array_merge($files, _slideshow_creator_explore_dir("$dir/", TRUE));
     }
   }
 
@@ -282,11 +280,14 @@
 	    $dir_attributes[1] = '/';
 	  }
 
-	  $recursive = isset($dir_attributes[2]) ? $dir_attributes[2] : '';
+	  $recursive = isset($dir_attributes[2]) ? $dir_attributes[2] == 'yes' : FALSE;
           if (
 	    !empty($dir_attributes[1]) and
 	    $files = _slideshow_creator_explore_dir(
-	      $dir_attributes[1], $recursive
+	      variable_get(
+                'file_directory_path', conf_path() . '/files'
+              ) . $dir_attributes[1],
+              $recursive
 	    )
 	  ) {
 	    $given_link    = empty($dir_attributes[3]) ? '' : $dir_attributes[3];
