Fixes #88 operator AND/OR issue