class Messages fix