fix some bugs
Revert "fix some bugs"

This reverts commit 9b5d09708a50c6f3e502aca99bdea094026606a0.