Fix option handling in CLI, 0.18.1