Bug fix for MessageProcessor