Implementing changes proposed in issue #1144

Test passed, but did not add a test for this option.