bug fixe started