pingendo

Closes #6768.
Merge pull request #6775 from vitorgalvao/fix-6768

pingendo