diff --git a/Source/NSMethodSignature.m b/Source/NSMethodSignature.m
index 0cd1adeac..fe45a820b 100644
--- a/Source/NSMethodSignature.m
+++ b/Source/NSMethodSignature.m
@@ -122,6 +122,11 @@ next_arg(const char *typePtr, NSArgumentInfo *info, char *outTypes)
       case _C_ID:
 	info->size = sizeof(id);
 	info->align = __alignof__(id);
+	/* Blocks are encoded as @? */
+	if (*(typePtr) == '?')
+	  {
+	    typePtr++;
+	  }
 	break;
 
       case _C_CLASS: