Merge pull request #1584 from rubenk/fix-wrong-logical-op