Hacked a fix for compatibility with HeroChat