S4S Makeup Batch fix?