fix both way sync