diff --git a/include/sigar_private.h b/include/sigar_private.h
index 21e7c98f..e50b79a9 100644
--- a/include/sigar_private.h
+++ b/include/sigar_private.h
@@ -310,9 +310,6 @@ int sigar_group_name_get(sigar_t *sigar, int gid, char *buf, int buflen);
     (disk)->service_time = SIGAR_FIELD_NOTIMPL; \
     (disk)->snaptime = 0
 
-#define SIGAR_DISK_STATS_NOTIMPL(fsusage) \
-    SIGAR_DISK_STATS_INIT(&fsusage->disk)
-
 /* key used for filesystem (/) -> device (/dev/hda1) mapping */
 /* and disk_usage cache for service_time */
 #define SIGAR_FSDEV_ID(sb) \
diff --git a/src/os/darwin/darwin_sigar.c b/src/os/darwin/darwin_sigar.c
index 9f24bdf6..bc5cb941 100644
--- a/src/os/darwin/darwin_sigar.c
+++ b/src/os/darwin/darwin_sigar.c
@@ -1679,7 +1679,7 @@ int sigar_file_system_usage_get(sigar_t *sigar,
     fsusage->disk_write_bytes = SIGAR_FIELD_NOTIMPL;
     fsusage->disk_queue       = SIGAR_FIELD_NOTIMPL;
 #else
-    SIGAR_DISK_STATS_NOTIMPL(fsusage);
+    SIGAR_DISK_STATS_INIT(&fsusage->disk)
 #endif
 
     return SIGAR_OK;
diff --git a/src/os/hpux/hpux_sigar.c b/src/os/hpux/hpux_sigar.c
index 6c89afd2..81b8fd60 100644
--- a/src/os/hpux/hpux_sigar.c
+++ b/src/os/hpux/hpux_sigar.c
@@ -612,7 +612,7 @@ int sigar_file_system_usage_get(sigar_t *sigar,
     fsusage->free_files = buf.f_ffree;
     fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage);
 
-    SIGAR_DISK_STATS_NOTIMPL(fsusage);
+    SIGAR_DISK_STATS_INIT(&fsusage->disk)
 
     if (!sigar->fsdev) {
         if (create_fsdev_cache(sigar) != SIGAR_OK) {
diff --git a/src/os/netware/netware_sigar.c b/src/os/netware/netware_sigar.c
index 0cf1d229..0e0608ca 100644
--- a/src/os/netware/netware_sigar.c
+++ b/src/os/netware/netware_sigar.c
@@ -341,7 +341,7 @@ int sigar_file_system_usage_get(sigar_t *sigar,
     fsusage->free_files = buf.f_ffree;
     fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage);
 
-    SIGAR_DISK_STATS_NOTIMPL(fsusage);
+    SIGAR_DISK_STATS_INIT(&fsusage->disk)
 
     return SIGAR_OK;
 }
diff --git a/src/os/osf1/osf1_sigar.c b/src/os/osf1/osf1_sigar.c
index 922657e3..494116fb 100644
--- a/src/os/osf1/osf1_sigar.c
+++ b/src/os/osf1/osf1_sigar.c
@@ -479,7 +479,7 @@ int sigar_file_system_usage_get(sigar_t *sigar,
     fsusage->free_files = buf.f_ffree;
     fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage);
 
-    SIGAR_DISK_STATS_NOTIMPL(fsusage);
+    SIGAR_DISK_STATS_INIT(&fsusage->disk)
 
     return SIGAR_OK;
 }
diff --git a/src/os/stub/stub_sigar.c b/src/os/stub/stub_sigar.c
index 23fcc325..510a3ba2 100644
--- a/src/os/stub/stub_sigar.c
+++ b/src/os/stub/stub_sigar.c
@@ -204,7 +204,7 @@ int sigar_file_system_usage_get(sigar_t *sigar,
     fsusage->used  = -1;
     fsusage->files = -1;
     fsusage->free_files = -1;
-    SIGAR_DISK_STATS_NOTIMPL(fsusage);
+    SIGAR_DISK_STATS_INIT(&fsusage->disk)
 
     return SIGAR_OK;
 }
diff --git a/src/os/win32/win32_sigar.c b/src/os/win32/win32_sigar.c
index 5dae06d2..e9ab43cf 100644
--- a/src/os/win32/win32_sigar.c
+++ b/src/os/win32/win32_sigar.c
@@ -1791,6 +1791,8 @@ SIGAR_DECLARE(int) sigar_disk_usage_get(sigar_t *sigar,
     PERF_COUNTER_DEFINITION *counter;
     DWORD perf_offsets[PERF_IX_DISK_MAX];
 
+    SIGAR_DISK_STATS_INIT(disk);
+
     if (!object) {
         return err;
     }
@@ -1874,10 +1876,6 @@ sigar_file_system_usage_get(sigar_t *sigar,
 
     status = sigar_disk_usage_get(sigar, dirname, &fsusage->disk);
 
-    if (status != SIGAR_OK) {
-        SIGAR_DISK_STATS_NOTIMPL(fsusage);
-    }
-
     return SIGAR_OK;
 }