fix #8560
Merge pull request #8668 from terminalmage/0.17

Fix for #8560