Fixed #23659 -- Kept annotate() args ordering

Thanks Loic Bistuer for the review.