Another try for large batch fix.