Fix option ordering