get rid of chaos

Change-Id: Id4d63d53789be9c23264825e5bcd41b0e940b15f