Fix circular sync