Fix up ordering

Change-Id: I666454839cdf122dbc6e64ff905639ad52ea6e12