Fixing dispatcher CLI [ci skip]