fixed missing && bugs