Revert "fix bugs"

This reverts commit 56a8267f34437527bddf1eca79894568196603f7.