Fix some bug

Signed-off-by: leo-ma <begeekmyfriend@gmail.com>