Bug fix

Change-Id: Ib4d7d8604c3cf337316d2232a4a6ff18fa07de86