Experimental changes for call/2