Small dispatcher fix