Pass cli.options; fix