bug fix and Done!

Signed-off-by: Neil Shen <overvenus@gmail.com>