handle sync bug fix