Bug fix

Change-Id: I73f42067ea10c63d62a796799d1c036f632ceb8a