Revert "fix bugs"

This reverts commit 8215f1c1865c7044e8a67b2f89f45d014128bc8f.