fixed "and" and "or"