Bug fix on OR/AND operator lazy evaluation