Fixing chat death bug