Fix up ordering issue

Change-Id: If04e5a021b7b059b3b1e202db841fb943af21447