diff --git a/hw/esp32-espi-dac.h b/hw/esp32-espi-dac.h
index 4a0f4d4..2c228f8 100644
--- a/hw/esp32-espi-dac.h
+++ b/hw/esp32-espi-dac.h
@@ -20,6 +20,7 @@
 
 // "tape" storage...
 #undef USE_SD
+#undef USE_FS
 #define USE_SPIFFS
 
 // sound: dac and pwm
diff --git a/hw/esp32-utft-dac.h b/hw/esp32-utft-dac.h
index a3d597a..286a161 100644
--- a/hw/esp32-utft-dac.h
+++ b/hw/esp32-utft-dac.h
@@ -16,6 +16,7 @@
 
 // "tape" storage...
 #undef USE_SD
+#undef USE_FS
 #define USE_SPIFFS
 
 // sound: dac and pwm
diff --git a/hw/esp8266-pwm.h b/hw/esp8266-pwm.h
index 9fe7d09..c6e67de 100644
--- a/hw/esp8266-pwm.h
+++ b/hw/esp8266-pwm.h
@@ -21,6 +21,7 @@
 // "tape" storage...
 #undef USE_SD
 #undef USE_SPIFFS
+#define USE_FS
 
 // sound
 #define PWM_SOUND	D2
diff --git a/sdtape.cpp b/sdtape.cpp
index b0202c9..f4c6568 100644
--- a/sdtape.cpp
+++ b/sdtape.cpp
@@ -7,7 +7,7 @@
 #elif defined(USE_SPIFFS)
 #include <SPIFFS.h>
 #define DISK	SPIFFS
-#elif defined(ESP8266)
+#elif defined(USE_FS)
 #include <FS.h>
 #endif
 
@@ -15,14 +15,16 @@
 
 #if defined(DISK)
 static File file, dir;
-#elif defined(ESP8266)
+#elif defined(USE_FS)
 static File file;
 static Dir dir;
 #endif
 
+#define STORAGE defined(USE_SD) || defined(USE_SPIFFS) || defined(USE_FS)
+
 bool sdtape::start(const char *programs)
 {
-#if defined(ESP8266)
+#if defined(USE_FS)
 	dir = SPIFFS.openDir("/");
 #elif defined(DISK)
 	dir = DISK.open(programs);
@@ -36,14 +38,14 @@ bool sdtape::start(const char *programs)
 
 void sdtape::stop()
 {
-#if defined(DISK) || defined(ESP8266)
+#if defined(STORAGE)
 	file.close();
 #endif
 }
 
 bool sdtape::more()
 {
-#if defined(DISK) || defined(ESP8266)
+#if defined(STORAGE)
 	if (_pos >= _len) {
 		_pos = 0;
 		_len = file.read(_buf, sizeof(_buf));
@@ -56,10 +58,10 @@ bool sdtape::more()
 }
 
 const char *sdtape::advance() {
-#if defined(DISK) || defined(ESP8266)
+#if defined(STORAGE)
 	bool rewound = false;
 	file.close();
-#if defined(ESP8266)
+#if defined(USE_FS)
 	static char buf[32];
 	while (true) {
 		if (dir.next()) {
@@ -92,7 +94,7 @@ const char *sdtape::advance() {
 }
 
 const char *sdtape::rewind() {
-#if defined(DISK) && !defined(ESP8266)
+#if defined(DISK)
 	dir.rewindDirectory();
 #endif
 	return advance();