Fixed #23659 -- Kept annotate() args ordering