Fix conversations
Merge pull request #1411 from KorvinSzanto/fix_conversations

Fix conversations