Fixed for updated Message class