Fix an issue encountered in CLI testing