Fixed syncing on server side