Fix bug with EQ2 && ||