Proposed fix for issue #9763