Minor fix, removed &&'s