Fixes #738
@tkopecek @puiterwijk @julian8628
This is an alternative to #735
:thumbsup:
Commit 22a7998f fixes this pull-request
Pull-Request has been merged by mikem
Fixes #738