Correctly handle sync+