Improve for osc sync #52