Fixed bug where I was incorrectly setting fields in the general message object.