Logical operators fixed (2)