diff --git a/reclass/adapters/salt.py b/reclass/adapters/salt.py
index 702eca2..beca9e5 100755
--- a/reclass/adapters/salt.py
+++ b/reclass/adapters/salt.py
@@ -9,11 +9,10 @@
 
 import os, sys, posix
 
-from reclass import get_storage, output
+from reclass import get_storage, output, get_path_mangler
 from reclass.core import Core
 from reclass.errors import ReclassException
-from reclass.config import find_and_read_configfile, get_options, \
-        path_mangler
+from reclass.config import find_and_read_configfile, get_options
 from reclass.constants import MODE_NODEINFO
 from reclass.defaults import *
 from reclass.version import *
@@ -26,6 +25,7 @@
                class_mappings=None,
                propagate_pillar_data_to_reclass=False):
 
+    path_mangler = get_path_mangler(storage_type)
     nodes_uri, classes_uri = path_mangler(inventory_base_uri, nodes_uri, classes_uri)
     storage = get_storage(storage_type, nodes_uri, classes_uri)
     input_data = None
@@ -47,6 +47,7 @@
         inventory_base_uri=OPT_INVENTORY_BASE_URI, nodes_uri=OPT_NODES_URI,
         classes_uri=OPT_CLASSES_URI, class_mappings=None):
 
+    path_mangler = get_path_mangler(storage_type)
     nodes_uri, classes_uri = path_mangler(inventory_base_uri, nodes_uri, classes_uri)
     storage = get_storage(storage_type, nodes_uri, classes_uri)
     reclass = Core(storage, class_mappings, input_data=None, default_environment='base')