more adjustment

Change-Id: I8521f730d42fdfd9a40547a6f85a8b2602584483