Fixes: #1167 Fixes: #339
This is more of a short term fix for this, but it does the job
:thumbsup:
rebased onto 25b70fe5b5e9d5166f9731e69f77e348a0a0c4e3
Commit aaed1f49 fixes this pull-request
Pull-Request has been merged by mikem
Fixes: #1167
Fixes: #339
This is more of a short term fix for this, but it does the job