Hotfix for Client's Communication