Fix in CLI\Dispatcher [ci skip]