Fix for issue #8945
Merge pull request #8971 from cvedel/issue_8945

Fix for issue #8945