cli; partial-fix for #1