Chat limit fix part 2