Fix for edit batch