@@ -110,16 +110,14 @@
 
 	if ((page = malloc(sizeof(*page))) == NULL)
 		@throw [OFOutOfMemoryException
 		    exceptionWithRequestedSize: sizeof(*page)];
 
-	if ((page->map = malloc(mapSize)) == NULL)
+	if ((page->map = calloc(1, mapSize)) == NULL)
 		@throw [OFOutOfMemoryException
 		    exceptionWithRequestedSize: mapSize];
 
-	of_explicit_memset(page->map, 0, mapSize);
-
 	page->page = mapPages(1);
 	of_explicit_memset(page->page, 0, pageSize);
 
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 	lastPage = of_tlskey_get(lastPageKey);