@@ -16,11 +16,11 @@
  */
 
 #import <Foundation/NSDictionary.h>
 
 #import "OFNSDictionary.h"
-#import "OFNSEnumerator.h"
+#import "NSEnumerator+OFObject.h"
 
 #import "NSBridging.h"
 #import "OFBridging.h"
 
 #import "OFInvalidArgumentException.h"
@@ -70,9 +70,8 @@
 	return _dictionary.count;
 }
 
 - (OFEnumerator *)keyEnumerator
 {
-	return [[[OFNSEnumerator alloc]
-	    initWithNSEnumerator: [_dictionary keyEnumerator]] autorelease];
+	return [_dictionary keyEnumerator].OFObject;
 }
 @end