Fix invalid dispatcher
Merge branch 'hotfix/invalid-dispatcher'