diff --git a/src/system/boot/loader/file_systems/fat/Directory.cpp b/src/system/boot/loader/file_systems/fat/Directory.cpp
index 1706473da9..77eaf27f3f 100644
--- a/src/system/boot/loader/file_systems/fat/Directory.cpp
+++ b/src/system/boot/loader/file_systems/fat/Directory.cpp
@@ -482,7 +482,8 @@ Directory::CreateFile(const char* name, mode_t permissions, Node** _node)
 	// prepare a directory entry for the new file
 	dir_entry entry;
 
-	memset(entry.fName, ' ', 11);
+	memset(entry.fName, ' ', sizeof(entry.fName));
+	memset(entry.fExt, ' ', sizeof(entry.fExt));
 		// clear both base name and extension
 	memcpy(entry.fName, baseName, baseNameLength);
 	if (extensionLength > 0)