Revert "Fixed issue"

This reverts commit 23180b455c3b5592cdcc68ce8038b9af405cb078.