Fix syncing issue