issue #20294: Fix broken opportunity.
Merge pull request #343 from jrogelstad/20212

issue #20294: Fix broken opportunity.