Sergeanur Sync fix from master