Revert "Fixing bug"

This reverts commit 7457809c2da67c2f755787953dad9bfc49e25024.