Bug fix

Change-Id: Iab7a7218b0497b5462ec00fdff644be8f9f46665