Fixed command option order