Fixed dispatcher bug