Revert "Fixed one of the issues"

This reverts commit 968b4baf9a7e095c1eb296fcf41b646962bb76e6.