Revert "Fixed Issue with Condition 0"

This reverts commit 0fbccaaadfe0397bfbcfcdbd33baa87ac8aceae2.