Fixing dispatcher creation