Triggers fix