[2773] Fixed dispatches

https://gist.github.com/kamilgrela/a554cb3ccfdf9844c7ed
ditto