Issue #57 Change if condition