Revert "Fixed issues"

This reverts commit b64881708303d4d9599c3a3b362cb0d9696be8ae.