Fixed condition bug from last merge regarding the same case and None vs....

... 0

Fixed the issue that was discussed in #9 after the merge.