fix issue in skipping option when advancing with duplicates
Reviewer: Chezka Arevalo (post-commit)