dispatch bug fix