Fix Reorder

Change-Id: I23a2f1a2ebf0e596ebb8d44169af9c83bb27c471