fix syncing issues