Fix dispatcher bug