Use proper version of dispatcher