Fix option passing