last batch skipping bug fixed