COOPR-503: change logic due to changes in common-cli