#324: Fixing Sync