Revert 8e16dc1..991bdac

This rolls back to commit 8e16dc153ddbeb1929da3957aa79402d06277867.
Revert 991bdac..921bfd8

This rolls back to commit 991bdac0778f93b4156e77886ea63ad10a638d8c.
Fixed a small bug