Fixed bug introduced in #83638.
Merge pull request #160 from luisromangz/8.5-SNAPSHOT-83638

Fixed bug introduced in #83638.