fixe new issues with batch jobs