diff --git a/shadow.c b/shadow.c
index 3ad3d8a..a1ace5b 100644
--- a/shadow.c
+++ b/shadow.c
@@ -1054,7 +1054,7 @@ static php_stream *shadow_dir_opener(php_stream_wrapper *wrapper, const char *pa
 	php_stream *tempdir = NULL, *instdir, *mergestream;
 	HashTable *mergedata;
 	php_stream_dirent entry;
-	void *dummy = (void *)1;
+	/* void *dummy = (void *)1; // Removed dummy, will store d_type */
 	char *templname = NULL;
 
 	if(options & STREAM_USE_GLOB_DIR_OPEN) {
@@ -1115,12 +1115,12 @@ static php_stream *shadow_dir_opener(php_stream_wrapper *wrapper, const char *pa
 	tempdir->flags |= PHP_STREAM_FLAG_NO_BUFFER;
 
 	ALLOC_HASHTABLE(mergedata);
-	zend_hash_init(mergedata, 10, NULL, NULL, 0);
+	zend_hash_init(mergedata, 10, NULL, NULL, 0); /* Value destructor is NULL, suitable for storing d_type as pointer-cast value */
 	while(php_stream_readdir(tempdir, &entry)) {
-		zend_hash_str_add_new_ptr(mergedata, entry.d_name, strlen(entry.d_name), &dummy);
+		zend_hash_str_add_ptr(mergedata, entry.d_name, strlen(entry.d_name), (void*)(zend_uintptr_t)entry.d_type);
 	}
 	while(php_stream_readdir(instdir, &entry)) {
-		zend_hash_str_update_ptr(mergedata, entry.d_name, strlen(entry.d_name), &dummy);
+		zend_hash_str_update_ptr(mergedata, entry.d_name, strlen(entry.d_name), (void*)(zend_uintptr_t)entry.d_type);
 	}
 	zend_hash_internal_pointer_reset(mergedata);
 	php_stream_free(instdir, PHP_STREAM_FREE_CLOSE);
@@ -1142,6 +1142,7 @@ static ssize_t shadow_dirstream_read(php_stream *stream, char *buf, size_t count
 	HashTable *mergedata = (HashTable *)stream->abstract;
 	zend_string *name = NULL;
 	zend_ulong num;
+	void *pData;
 
 	/* avoid problems if someone mis-uses the stream */
 	if (count != sizeof(php_stream_dirent))
@@ -1156,6 +1157,13 @@ static ssize_t shadow_dirstream_read(php_stream *stream, char *buf, size_t count
 	zend_hash_move_forward(mergedata);
 
 	PHP_STRLCPY(ent->d_name, ZSTR_VAL(name), sizeof(ent->d_name), ZSTR_LEN(name));
+	if (zend_hash_get_current_data_ptr(mergedata, &pData) == SUCCESS) {
+		ent->d_type = (unsigned char)(zend_uintptr_t)pData;
+	} else {
+		/* This case should ideally not be reached if the key exists. */
+		/* Default to DT_UNKNOWN if data retrieval fails for some reason. */
+		ent->d_type = DT_UNKNOWN;
+	}
 	return sizeof(php_stream_dirent);
 }
 
diff --git a/tests/fixtures/instance/api/rest.php b/tests/fixtures/instance/api/rest.php
new file mode 100644
index 0000000..e69de29
diff --git a/tests/fixtures/templatedir/api/rest.php b/tests/fixtures/templatedir/api/rest.php
new file mode 100644
index 0000000..e69de29
diff --git a/tests/fixtures/templatedir/qwe/.gitkeep b/tests/fixtures/templatedir/qwe/.gitkeep
new file mode 100644
index 0000000..fdfb43d
--- /dev/null
+++ b/tests/fixtures/templatedir/qwe/.gitkeep
@@ -0,0 +1 @@
+// Empty file to ensure directory creation
diff --git a/tests/iterator_test.phpt b/tests/iterator_test.phpt
new file mode 100644
index 0000000..0d6348c
--- /dev/null
+++ b/tests/iterator_test.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Check iterators failure
+--SKIPIF--
+<?php if (!extension_loaded("shadow")) print "skip"; ?>
+--FILE--
+<?php
+require_once('setup.inc');
+
+$topLevelDirs = ["$template/qwe", "$template/api",];
+
+foreach ($topLevelDirs as $dir) {
+//    var_dump($dir);
+    $count = 0;
+    $iterator = new RecursiveIteratorIterator(
+        new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS),
+        RecursiveIteratorIterator::SELF_FIRST
+    );
+
+    foreach ($iterator as $item) {
+        $count++;
+        // Add a var_dump to see what items are being iterated
+        // var_dump($item->getPathname());
+    }
+    // Add a var_dump to see the final count for each directory
+    // var_dump("Count for $dir: $count");
+}
+
+// Add a success message if no errors occur
+echo "Iterator test completed successfully.\n";
+
+?>
+--EXPECT--
+Iterator test completed successfully.