fix issues with ExecutionDelegatingHandler;