Fix mistake involving a bit too many &&'s