Fix logic or, and