Small bug fix

Change-Id: I8393670ee8077659bdf33cdb09819a1c31601978