Should fix double-sync bug.