Fixing option order.

Change-Id: I23d2a9f7186a7a532d2836efd99590f81d75da70