Fixed tracking with the hero