Fixed 2-way sync