update fix bug 1084011
An update to the fix bug 1084011 pull request based on feedback in the pull request.