Only evaluate the test once in COND
Merge pull request #32 from Strigoides/master

Fix COND bug