fixes: #1082
Waiting to see if there is feedback on my comments in #1082
Commit b730995e fixes this pull-request
Pull-Request has been merged by mikem
fixes: #1082