This is a follow up to PR #402 Fixes #387
Also fixes the unit test
:thumbsup:
Commit 22cab961 fixes this pull-request
Pull-Request has been merged by mikem
This is a follow up to PR #402
Fixes #387
Also fixes the unit test