defect fix as before