issue and new changes fixed