Fixed CLI project