Fix the order

Change-Id: I900570cf10bab286b604e3f0098d8e7cb3dd4d63