Small bugfix for CLI