Revert "fixes issue #3 by checking correct conditions"

This reverts commit f6bb50a533c3eaa6a0000b8f39768307c6e5754e.
fixes issue #16 by checking correct conditions