We didn't set previously what we catched from CLI. Note, this is a temporary solution until we refactor the cli code Fixes #186