fixed inifinite loop on hero