CLI fixed