Potential Fix for Batch issue