Fix Issue 6730
Merge pull request #1823 from andralex/6730

Fix Issue 6730