Fix re-triggers