fuzhuo's remaining commit

Signed-off-by: Billy Mao <hello2mao@outlook.com>