diff --git a/ChangeLog b/ChangeLog
index 49cba072..92d92289 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-11 01:04 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* GormCore/GormDocument.m
+	* GormCore/GormObjectEditor.m: Corrected problem with resource
+	manager.
+
 2005-04-10 23:59 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* GormCore/GormDocument.m: Moved call to register IBResourceManager
diff --git a/GormCore/GormDocument.m b/GormCore/GormDocument.m
index d6ece2e6..c7423090 100644
--- a/GormCore/GormDocument.m
+++ b/GormCore/GormDocument.m
@@ -1297,6 +1297,7 @@ static NSImage  *fileImage = nil;
 	{
 	  NSDebugLog(@"WARNING anEditor = editor");
 	}
+
       [editor activate];
       RELEASE((NSObject *)editor);
 
diff --git a/GormCore/GormObjectEditor.m b/GormCore/GormObjectEditor.m
index b4706c4c..4417022f 100644
--- a/GormCore/GormObjectEditor.m
+++ b/GormCore/GormObjectEditor.m
@@ -114,9 +114,8 @@ static NSMapTable	*docMap = 0;
 
 - (BOOL) acceptsTypeFromArray: (NSArray*)types
 {
-  if ([types containsObject: IBObjectPboardType] == YES)
-    return YES;
-  return NO;
+  NSArray *resourceTypes = [resourceManager resourcePasteboardTypes];
+  return ([resourceTypes firstObjectCommonWithArray: types] != nil);
 }
 
 - (void) pasteInSelection
@@ -497,7 +496,7 @@ static NSMapTable	*docMap = 0;
   /*
    * Tell the source that we will accept the drop if we can.
    */
-  if (dragType == IBObjectPboardType)
+  if ([[resourceManager resourcePasteboardTypes] containsObject: dragType]) 
     {
       /*
        * We can accept objects dropped anywhere.