fixed use of && for AND