Fixed dispatching errors