broken changes fixed