modify carefully

Change-Id: I22ed368641514bd2d37f12ecddddda254eeb3b47