Fixed ordering

Change-Id: I550f5759f1d5b7159a26e6fe83ea0b1704d8f13b