Bug fixed

Change-Id: Iff1f4903fcdc16d8cf46bed54d4df751fba24fac