Batch close fix