Sync many bug fix