Fixed batch exiting later