Revert "Fixed a couple of bugs"

This reverts commit 7fc4645ab347ed63015c34d7b325a0c399f2e5c1.