Fix option count