Trying to fix syncing issues