Fix #8219
Merge pull request #712 from ddanielvaz/fix-8219

Fix 8219