Fix for issue #8945