fixed the && bug