bug from zyw's email

Change-Id: Ie426cc7105fb35e334270eac78ef178c6fae2258