Bugfix on CLI