Sync fix from sdb