Revert "fix some bug"

This reverts commit e9b9e53f8be7a220ca7e101e42b7c204dd9fb36c.