fixed CLI behaviour