fixed bug with or conditional.