made sync more stable