Hero fix again