Bug-fix: CLI wasn't working correctly.