Messages fix & compare objects instead of ID's