Fix chat-id and chat_id