diff --git a/DSS/API/Execute.ASM b/DSS/API/Execute.ASM
index 71264ef..c4c9fc6 100644
--- a/DSS/API/Execute.ASM
+++ b/DSS/API/Execute.ASM
@@ -423,6 +423,7 @@ _TST_PROC_2:	LD	SP,(CORE_BUFFERS.EXEBUFF.SP_REG)
 		 OR	A
 		 JR	NZ,.set_path
 		 CALL	DIR_PATH_CHANGE.FullCurrent
+		 LD	HL,CORE_BUFFERS.CurrentPath
 .set_path:	 CALL	CHDIR_FN
 		 POP	IX
 		;
diff --git a/DSS/DSS-MAIN.ASM b/DSS/DSS-MAIN.ASM
index 51b6249..0b896b7 100644
--- a/DSS/DSS-MAIN.ASM
+++ b/DSS/DSS-MAIN.ASM
@@ -514,6 +514,8 @@ CLEAR_ZONE.size         EQU _sBuffers
 	EXPORT	CORE_BUFFERS.BUFFER
 	EXPORT	CORE_BUFFERS.SECTOR_BUFFER
 	EXPORT	CORE_BUFFERS.MemoryTable
+	EXPORT	CORE_BUFFERS.CurrentDirectory
+	EXPORT	CORE_BUFFERS.WorkDirectory
 /*
 ;R11    \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ 
 FM_BUF          _sFM=$
diff --git a/DSS/build.txt b/DSS/build.txt
index 19c7bdb..8e2afd3 100644
--- a/DSS/build.txt
+++ b/DSS/build.txt
@@ -1 +1 @@
-16
\ No newline at end of file
+17
\ No newline at end of file
diff --git a/SHELL/build.txt b/SHELL/build.txt
index ee2b836..2da4325 100644
--- a/SHELL/build.txt
+++ b/SHELL/build.txt
@@ -1 +1 @@
-456
\ No newline at end of file
+457
\ No newline at end of file