Another bug fix on submit batch