Revert "Fix bugs"

This reverts commit 6997a14a51291fd598363b5ee60e87c80c6ea26f.