Fix Chat handler