Message issue workaround
Merge pull request #125 from ds125v/message_workaround

Message issue workaround