@@ -32,11 +32,11 @@
 
 #import "OFProcess.h"
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFDictionary.h"
-#import "OFDataArray.h"
+#import "OFData.h"
 #import "OFLocalization.h"
 
 #import "OFInitializationFailedException.h"
 #import "OFNotOpenException.h"
 #import "OFOutOfRangeException.h"
@@ -399,20 +399,20 @@
 	return envp;
 }
 #else
 - (char16_t *)of_environmentForDictionary: (OFDictionary *)environment
 {
-	OFDataArray *env;
+	OFMutableData *env;
 	OFEnumerator *keyEnumerator, *objectEnumerator;
 	OFString *key, *object;
 	const char16_t equal = '=';
 	const char16_t zero[2] = { 0, 0 };
 
 	if (environment == nil)
 		return NULL;
 
-	env = [OFDataArray dataArrayWithItemSize: sizeof(char16_t)];
+	env = [OFMutableData dataWithItemSize: sizeof(char16_t)];
 
 	keyEnumerator = [environment keyEnumerator];
 	objectEnumerator = [environment objectEnumerator];
 	while ((key = [keyEnumerator nextObject]) != nil &&
 	    (object = [objectEnumerator nextObject]) != nil) {