Dispatcher fix for test