Dispatcher fix