Proposed change to fix Issue 491.