diff --git a/source/Stargate-JSON-RPC-Tests/JRPCSelfContainedBlockHandlerTest.class.st b/source/Stargate-JSON-RPC-Tests/JRPCSelfContainedBlockHandlerTest.class.st
deleted file mode 100644
index ef2edcd..0000000
--- a/source/Stargate-JSON-RPC-Tests/JRPCSelfContainedBlockHandlerTest.class.st
+++ /dev/null
@@ -1,21 +0,0 @@
-"
-A JRPCSelfContainedBlockHandlerTest is a test class for testing the behavior of JRPCSelfContainedBlockHandler
-"
-Class {
-	#name : #JRPCSelfContainedBlockHandlerTest,
-	#superclass : #TestCase,
-	#category : #'Stargate-JSON-RPC-Tests'
-}
-
-{ #category : #tests }
-JRPCSelfContainedBlockHandlerTest >> testArgumentCountAndArgumentNamesDontMatch [
-
-	self
-		should: [ 
-			JRPCSelfContainedBlockHandler forProcedureNamed: 'x'
-				withArgumentNames: #(  )
-				evaluating: [ :one |  ]
-			]
-		raise: InstanceCreationFailed
-		withMessageText: 'The number of arguments must be consistent with the block to evaluate'
-]
diff --git a/source/Stargate-JSON-RPC/JsonRPCRequestHandler.class.st b/source/Stargate-JSON-RPC/JsonRPCRequestHandler.class.st
index 953a91c..5110dd2 100644
--- a/source/Stargate-JSON-RPC/JsonRPCRequestHandler.class.st
+++ b/source/Stargate-JSON-RPC/JsonRPCRequestHandler.class.st
@@ -33,9 +33,7 @@ JsonRPCRequestHandler >> addHandlerNamed: aString evaluating: aBlock [
 { #category : #configuring }
 JsonRPCRequestHandler >> addHandlerNamed: aString withArgumentNames: argumentNames evaluating: aBlock [
 
-	messageProcessor addHandler: ( JRPCSelfContainedBlockHandler forProcedureNamed: aString
-			  withArgumentNames: argumentNames
-			  evaluating: aBlock )
+	messageProcessor addHandlerNamed: aString withArgumentsNamed: argumentNames evaluating: aBlock
 ]
 
 { #category : #configuring }