3 files changed, 3 insertions, 27 deletions
diff --git a/src/function/read_directory.cc b/src/function/read_directory.cc
index f8f99d6..09f8221 100644
--- a/src/function/read_directory.cc
+++ b/src/function/read_directory.cc
@@ -19,15 +19,7 @@ xalan::XObjectPtr FunctionReadDirectory::execute(
 	const xalan::XObjectPtr argument,
 	const xalan::Locator* locator
 ) const {
-	const FilesystemContext fs_context(
-		boost::filesystem::path(
-			*XercesStringGuard<char>(
-				xercesc::XMLString::transcode(
-					locator->getSystemId() + 7
-				)
-			)
-		).parent_path().string()
-	);
+	const FilesystemContext fs_context(locator);
 
 	const boost::filesystem::path directoryPath(
 		fs_context.resolve(argument->str())
diff --git a/src/function/read_file.cc b/src/function/read_file.cc
index 633559e..8fcc04b 100644
--- a/src/function/read_file.cc
+++ b/src/function/read_file.cc
@@ -34,15 +34,7 @@ xalan::XObjectPtr FunctionReadFile::execute(
 	const xalan::XObjectPtr argument,
 	const xalan::Locator* locator
 ) const {
-	const FilesystemContext fs_context(
-		boost::filesystem::path(
-			*XercesStringGuard<char>(
-				xercesc::XMLString::transcode(
-					locator->getSystemId() + 7
-				)
-			)
-		).parent_path().string()
-	);
+	const FilesystemContext fs_context(locator);
 
 	const boost::filesystem::path filePath(
 		fs_context.resolve(argument->str())
diff --git a/src/function/read_xml_file.cc b/src/function/read_xml_file.cc
index dc98fc7..0fa21fe 100644
--- a/src/function/read_xml_file.cc
+++ b/src/function/read_xml_file.cc
@@ -40,15 +40,7 @@ xalan::XObjectPtr FunctionReadXmlFile::execute(
 	const xalan::XObjectPtr argument,
 	const xalan::Locator* locator
 ) const {
-	const FilesystemContext fs_context(
-		boost::filesystem::path(
-			*XercesStringGuard<char>(
-				xercesc::XMLString::transcode(
-					locator->getSystemId() + 7
-				)
-			)
-		).parent_path().string()
-	);
+	const FilesystemContext fs_context(locator);
 
 	const boost::filesystem::path filePath(
 		fs_context.resolve(argument->str())