get rid of chaos

Change-Id: Ic4feb927c7b16bed1dad125f34b31616d21a0cdf