Keep some order

Change-Id: I35dc947b7486adcb97485824564a19919bb5f87a