pull request for issue #7245

all tests are now passing on Travis.