Proposed change for issue #945