Fixed cli_verify