Since upgrade to 3.6 Batch commands not working properly