fix whole sync