Revert "- fixed bugs"

This reverts commit 7d9c14142b1362cc3ef819848d00a479241bdaf7.