One more fix for the new Message.construct function