Attempt to fix circular sync