Fix conversation bug