Fixed Message.class