Bug fix on chat