Added suport (kind of) for batch v1.8