Modifying dispatch function
Merge branch 'hotfix/404'