Fixed Message class