Fixed Message dispatching.