changed the syntax of condition, closes #240