Fix for conversation creation
Fix for the fix
Merge with master