Fix #5 chat demo