diff --git a/src/tests/kernel/boot/loader/Handle.cpp b/src/tests/kernel/boot/loader/Handle.cpp
index ce397896a0..e9f1b47877 100644
--- a/src/tests/kernel/boot/loader/Handle.cpp
+++ b/src/tests/kernel/boot/loader/Handle.cpp
@@ -108,16 +108,16 @@ Handle::GetName(char *nameBuffer, size_t bufferSize) const
 off_t 
 Handle::Size() const
 {
-	// ToDo: fix this!
-	return 1024LL * 1024 * 1024 * 1024;
-		// 1024 GB
-/*	struct stat stat;
-	if (fstat(fHandle, &stat) == B_OK)
+	struct stat stat;
+	if (fstat(fHandle, &stat) == B_OK) {
+		if (stat.st_size == 0) {
+			// ToDo: fix this!
+			return 1024LL * 1024 * 1024 * 1024;
+				// 1024 GB
+		}
 		return stat.st_size;
-
-	// stat apparently doesn't work with devices
+	}
 
 	return 0LL;
-*/
 }