修复一些bug
Revert "修复一些bug"

This reverts commit 479e5e254fee96b9779bfe303299fd14d971c9b2.