fix countersign logic for annotations