Hotfix on batch updates