Fix bug which made conversations appear incorrectly