fix dispatcher