Change and correct trigger locations.