- some optimization in DispatchHandler