Fix option order