Fixed the dispatcher