Addressing  the first message bug in #346.
Not closing the Issue (yet) as there still seems to be some discussion re timing.