Fixed bug
Revert "Fixed bug"

This reverts commit 64153b6bd5d23963e05883611924f3bdbaf7c323.