made sync more robust, potential stutter fix