Batch fix #3;