begin fix sync bug