Triggers fixed