hotfix for chat issue