Slightly modified the way the dispatcher is initialized.