Fixed broken CLI interface