Revert "fixed bug"

This reverts commit 0ec7878fe918db5c91745050652ab5c11be9d968.
Revert "fixed errors"

This reverts commit afcb48e6065ae9355ec7b213f583054a245b8be6.