Revisit Bug #1

Signed-off-by: PlutoniumHeart <zhitaoli.hust@gmail.com>