force struct use for messaging fixes #2