diff --git a/ue4docker/diagnostics/diagnostic_8gig.py b/ue4docker/diagnostics/diagnostic_8gig.py
index 6e565d30..cf3f2a32 100644
--- a/ue4docker/diagnostics/diagnostic_8gig.py
+++ b/ue4docker/diagnostics/diagnostic_8gig.py
@@ -28,11 +28,11 @@ def getDescription(self):
 		Returns a description of what the diagnostic does
 		'''
 		return '\n'.join([
-			'This diagnostic determines if the Docker daemon suffers from the 8GiB filesystem',
-			'layer bug reported here: https://github.com/moby/moby/issues/37581',
+			'This diagnostic determines if the Docker daemon suffers from one of the 8GiB filesystem',
+			'layer bugs reported at https://github.com/moby/moby/issues/37581 (affects all platforms) ',
+			'or https://github.com/moby/moby/issues/40444 (Windows containers only)',
 			'',
-			'This bug was fixed in Docker CE 18.09.0, but still exists in some versions of',
-			'Docker CE under Windows 10 and Docker EE under Windows Server.',
+			'#37581 was fixed in Docker CE 18.09.0, but #40444 has not been fixed as-of Docker CE 19.03.12',
 			'',
 			self._parser.format_help()
 		])
diff --git a/ue4docker/dockerfiles/diagnostics/8gig/windows/Dockerfile b/ue4docker/dockerfiles/diagnostics/8gig/windows/Dockerfile
index f295dba1..2848fbef 100644
--- a/ue4docker/dockerfiles/diagnostics/8gig/windows/Dockerfile
+++ b/ue4docker/dockerfiles/diagnostics/8gig/windows/Dockerfile
@@ -6,19 +6,5 @@ SHELL ["cmd", "/S", "/C"]
 # Add a sentinel label so we can easily identify intermediate images
 LABEL com.adamrehn.ue4-docker.sentinel="1"
 
-# Write an 8GiB file in blocks of 1GiB to avoid allocating too much memory in one hit
-RUN powershell "`
-	$ErrorActionPreference = 'Stop';`
-	$writer = [System.IO.File]::OpenWrite('file');`
-	`
-	$random = new-object Random;`
-	$blockSize = 1073741824;`
-	$bytes = new-object byte[] $blockSize;`
-	for ($i=0; $i -lt 8; $i++)`
-	{`
-		$random.NextBytes($bytes);`
-		$writer.Write($bytes, 0, $blockSize);`
-	}`
-	`
-	$writer.Close();`
-	"
+# Write an 8GiB sparse file
+RUN powershell "fsutil.exe file createnew file 8589934592"