@@ -513,17 +513,17 @@
 			if (keyElement == nil || valueElement == nil)
 				@throw [OFInvalidArgumentException
 				    newWithClass: isa
 					selector: _cmd];
 
-			key = [OFSerialization objectByDeserializingXMLElement:
-			    [keyElement elementForName: @"object"
-					     namespace: OF_SERIALIZATION_NS]];
-			object = [OFSerialization
-			    objectByDeserializingXMLElement:
-			    [valueElement elementForName: @"object"
-					       namespace: OF_SERIALIZATION_NS]];
+			key = [[keyElement elementForName: @"object"
+						namespace: OF_SERIALIZATION_NS]
+			    objectByDeserializing];
+			object = [[valueElement
+			    elementForName: @"object"
+				 namespace: OF_SERIALIZATION_NS]
+			    objectByDeserializing];
 
 			[dictionary setObject: object
 				       forKey: key];
 
 			[pool2 releaseObjects];