Revert "fix some bug"

This reverts commit 22014a228c8498edcea5f76e97cae1ed8c303d4a.
1