Solves Issue 7071
Merge pull request #259 from aigualada/Issue.7071

Change to solve Issue #7071.