Revert "fix bugs"

This reverts commit 6d0a651e6b1746b606305b8f18d9aa0d3b861eea.