target: fixed a couple bugs where annotations were skipped