Bugfix for MessageDispatcher