Conversation fix. Battle Beta version