Fix the object creation to actually relate messages.