diff --git a/reclass/config.py b/reclass/config.py
index 7fcb2ad..8deb299 100644
--- a/reclass/config.py
+++ b/reclass/config.py
@@ -87,14 +87,13 @@
 
 def path_mangler(inventory_base_uri, nodes_uri, classes_uri):
 
-    if inventory_base_uri is not None:
-        # if inventory_base is given, default to subdirectories
-        nodes_uri = nodes_uri or 'nodes'
-        classes_uri = classes_uri or 'classes'
-
-    else:
+    if inventory_base_uri is None:
+        # if inventory_base is not given, default to current directory
         inventory_base_uri = os.getcwd()
 
+    nodes_uri = nodes_uri or 'nodes'
+    classes_uri = classes_uri or 'classes'
+
     def _path_mangler_inner(path):
         ret = os.path.join(inventory_base_uri, path)
         ret = os.path.expanduser(ret)