fix batch system