Fix and making clear

Change-Id: I56fbe5a90eac78fda74750c88569cec3400d7f2f