@@ -161,11 +161,11 @@
 				_capacity *= 2;
 
 		if (_capacity < MIN_CAPACITY)
 			_capacity = MIN_CAPACITY;
 
-		_buckets = of_calloc(_capacity, sizeof(*_buckets));
+		_buckets = of_alloc_zeroed(_capacity, sizeof(*_buckets));
 
 		if (of_hash_seed != 0)
 			_rotate = of_random16() & 31;
 	} @catch (id e) {
 		[self release];
@@ -323,11 +323,11 @@
 	 * below the minimum capacity.
 	 */
 	if ((capacity < _capacity && count > _count) || capacity < MIN_CAPACITY)
 		return;
 
-	buckets = of_calloc(capacity, sizeof(*buckets));
+	buckets = of_alloc_zeroed(capacity, sizeof(*buckets));
 
 	for (unsigned long i = 0; i < _capacity; i++) {
 		if (_buckets[i] != NULL && _buckets[i] != &deleted) {
 			unsigned long j, last;
 
@@ -412,11 +412,11 @@
 		}
 
 		if (i >= last)
 			@throw [OFOutOfRangeException exception];
 
-		bucket = of_malloc(1, sizeof(*bucket));
+		bucket = of_alloc(1, sizeof(*bucket));
 
 		@try {
 			bucket->key = _keyFunctions.retain(key);
 		} @catch (id e) {
 			free(bucket);