diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a278efe7b6..45d971aba4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,10 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-10-02 10:58 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * tests/tstdspac.prg
+    ! fixed two problems
+
 2012-10-02 04:07 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/hbnf/dispc.c
     + added TOFIX (needs to be updated for unicode savescreen buffers)
diff --git a/harbour/tests/tstdspac.prg b/harbour/tests/tstdspac.prg
index 06bd0eed97..dc92a162b6 100644
--- a/harbour/tests/tstdspac.prg
+++ b/harbour/tests/tstdspac.prg
@@ -25,13 +25,12 @@
 PROCEDURE Main( cDisk )
 
    IF Empty( cDisk )
-      cDisk := "0"
+      cDisk := hb_DirBase() + hb_ps()
    ENDIF
-   cDisk := Val( cDisk )
 
-   ? "Bytes available on disk: " + Transform( DiskSpace( cDisk, HB_DISK_FREE ), "999,999,999,999" )
-   ? "Bytes available for use: " + Transform( DiskSpace( cDisk, HB_DISK_AVAIL ), "999,999,999,999" )
-   ? "             Bytes used: " + Transform( DiskSpace( cDisk, HB_DISK_USED ), "999,999,999,999" )
-   ? " Total bytes on disk " + PadL( cDisk, 2 ) + ": " + Transform( DiskSpace( cDisk, HB_DISK_TOTAL ), "999,999,999,999" )
+   ? "Bytes available on disk: " + Transform( hb_DiskSpace( cDisk, HB_DISK_FREE ), "999,999,999,999" )
+   ? "Bytes available for use: " + Transform( hb_DiskSpace( cDisk, HB_DISK_AVAIL ), "999,999,999,999" )
+   ? "             Bytes used: " + Transform( hb_DiskSpace( cDisk, HB_DISK_USED ), "999,999,999,999" )
+   ? " Total bytes at " + cDisk + ": " + Transform( hb_DiskSpace( cDisk, HB_DISK_TOTAL ), "999,999,999,999" )
 
    RETURN