Chat handler fix