Solve quality defect and production issue