keep things ordered

Change-Id: I9b2ab9f81a28eb81d3aa8df621dad3aedc034786