CLI controler bugfix