Fix - Reconstruct Message

there was a bug in reconstructing the message back to the client.
check the commit log for details.