fix the && signs