diff --git a/ChangeLog b/ChangeLog
index d327d05d2..48ca7c1eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-07  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSInvocation.m (-initWithTarget:selector:): Correct copying
+	of unhandled argument types.
+
 2001-03-07  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSObject.m: ([methodSignatureForSelector:]) reliability
diff --git a/Source/NSInvocation.m b/Source/NSInvocation.m
index 662137618..6e721da57 100644
--- a/Source/NSInvocation.m
+++ b/Source/NSInvocation.m
@@ -698,12 +698,12 @@ _arg_addr(NSInvocation *inv, int index)
 #endif
 #endif
 	      NSLog(@"Unsafe handling of type of %d argument.", i-1);
-	      memcpy(datum, ap, size);
 	      {
 		struct {
 		  char	x[size];
 		} dummy;
 		dummy = va_arg(ap, typeof(dummy));
+	        memcpy(datum, dummy.x, size);
 	      }
 	      break;
 	    }