Oops, now fixed the Dispatcher Generator